Commit graph

2450 commits

Author SHA1 Message Date
tartaric_acid
ea06819f38 Update zh_CN language file for 1.12 (#976)
* Complete part of the translation.

* finish zh_CN language file update

* fix a typo
2017-11-30 02:48:58 -05:00
Shadows_of_Fire
15b2cf2d5a update forge 2017-11-27 16:30:10 -05:00
Shadows_of_Fire
0d6adca7c7 <> is illegal 2017-11-20 11:46:07 -05:00
Mike Botsko
bb1568afbc Fixes typo in biomash manual (#966) 2017-11-17 14:04:46 -05:00
Brennan Ward
b7e6e7909b
Merge pull request #965 from prism/fix/typo
Fixes typo in lens of disenchanting manual
2017-11-16 22:15:01 -05:00
Mike Botsko
a23b0a2378 Fixes typo in lens of disenchanting manual 2017-11-16 19:00:55 -08:00
Shadows_of_Fire
9bed6f7ea5 no more lamp sneak 2017-11-15 18:11:17 -05:00
Shadows_of_Fire
9ca8e3d1ce r124 2017-11-03 22:14:31 -04:00
Brennan Ward
6ded1cc7b3
BAD NULL
remov null via mobil
2017-11-03 13:37:21 -04:00
Shadows_of_Fire
bb8a42bfed r123 2017-11-02 20:02:40 -04:00
Shadows_of_Fire
856d62f78c remov null 2017-11-02 17:49:53 -04:00
Shadows_of_Fire
636156d2ee r122 2017-10-31 20:24:33 -04:00
Shadows_of_Fire
e95da124f1 touch up jei handler 2017-10-31 18:31:34 -04:00
Shadows_of_Fire
585777b9e0 Closes #885 2017-10-31 18:01:15 -04:00
Brennan Ward
c09ebe299a
Merge pull request #955 from Artemish/master
Added Compost recipes to JEI (Closes #791)
2017-10-31 16:06:56 -04:00
Artemish
aaedc88953 Added Compost recipes to JEI 2017-10-30 21:19:48 -05:00
Shadows_of_Fire
05e37320ba Don't pickup things from conveyor belts 2017-10-23 13:08:17 -04:00
Shadows_of_Fire
100b10eb7a no more display stand torches bleh 2017-10-05 18:36:35 -04:00
Shadows_of_Fire
19402f3650 Fixes #929 2017-10-05 09:06:26 -04:00
Brennan Ward
6a16bbfc4b Merge pull request #934 from thiakil/itemstack-handler
don't return internal copy of itemstack on simulate
2017-10-01 01:17:00 -04:00
Xander
2f2de97bf2 don't return internal copy of itemstack on simulate 2017-10-01 13:05:47 +08:00
Shadows_of_Fire
7d28e768ca r121 2017-09-29 22:49:50 -04:00
Shadows_of_Fire
2f505dc24a Fixes #932 2017-09-29 22:47:10 -04:00
Shadows_of_Fire
75f9b17154 fix it for real this time 2017-09-25 15:54:53 -04:00
Shadows_of_Fire
dcd8f5207b Fixes #928 2017-09-24 14:32:24 -04:00
Ellpeck
cbbc6253df Update specialPeopleStuff.properties 2017-09-24 01:01:36 +01:00
Shadows_of_Fire
db7daa3343 Closes #884 2017-09-23 02:16:10 -04:00
Shadows_of_Fire
562f0c07e6 Closes #922 2017-09-23 01:55:01 -04:00
Ellpeck
cea5806803 Update specialPeopleStuff.properties 2017-09-22 01:04:44 +01:00
Shadows_of_Fire
b997e1b03d r120 2017-09-21 10:26:30 -04:00
Shadows_of_Fire
1fe930b395 switch to new getDrops method
If this causes issues, its on other people's end to resolve it.  They
should stop overriding the old one.  But, this is basically asking for
trouble.
2017-09-17 02:47:04 -04:00
Shadows_of_Fire
e8058e252a y tho 2017-09-13 12:50:12 -04:00
Shadows_of_Fire
cf8e1bbf56 Closes #912 2017-08-30 12:28:35 -04:00
Shadows_of_Fire
1abb89c512 Closes #911 2017-08-27 21:12:20 -04:00
Ellpeck
228cd55387 r119 because Shadows is annoying 2017-08-27 18:35:45 +02:00
Shadows_of_Fire
65482ada4a doot 2017-08-24 01:02:52 -04:00
Shadows_of_Fire
1e817c3fa9 Fixes #904 finally, probably for the last time
Also deduplicates multiple entries of say 1 iron ore to LITERALLY EVERY
IRON DUST because that was stupid and just clutter.
2017-08-24 01:00:33 -04:00
Shadows_of_Fire
fa25cbf7b0 Magnet ring now only works in survival/adventure; Closes #903 2017-08-22 20:06:34 -04:00
Shadows_of_Fire
22f9f4440e Closes #904 2017-08-22 20:01:54 -04:00
Ellpeck
77a808ab76 r118 2017-08-21 02:33:37 +02:00
Shadows_of_Fire
6ef76a16ea more deprecation things, mainly moving away from all uses of getStateFromMeta
Changes in LensColor, LensMining, and MethodHandler might all catch on
fire, idk.
i checked them and they worked tho so blahr
2017-08-17 01:06:09 -04:00
Shadows_of_Fire
2d3e90068f Closes #891
probably, anyway, idk what weights other mods are using tho so whatever
2017-08-16 05:42:22 -04:00
Shadows_of_Fire
e44b13c554 Closes #886 2017-08-11 18:15:09 -04:00
Shadows_of_Fire
2239a8a783 More deprecation stuffs
1.13 will remove metadata so expect a few more of these for the remainig
getStateFromMeta stuff... Hopefully this doesn't set anything on fire
2017-08-09 12:20:55 -04:00
Shadows_of_Fire
ed736f3c66 final touch on #881 2017-08-08 15:03:24 -04:00
Shadows_of_Fire
f9d226cfc9 Closes #881
Now, this doesn't really work, because putting power in the
reconstructor doesn't cause a block update.  But it exists, and it'll
try its hardest.  But i'm not making the power input cause a block
update.
2017-08-08 14:28:30 -04:00
Shadows_of_Fire
9aed16c52a Closes #878
These are vanilla items blargh
2017-08-08 11:05:44 -04:00
Shadows_of_Fire
daefd71504 important 2017-08-08 08:02:04 -04:00
Shadows_of_Fire
2ee695359c Fixes #880
probably, anyway
2017-08-08 08:01:28 -04:00
Shadows_of_Fire
64e6df805b how 2 police 2017-08-06 04:29:28 -04:00