Commit graph

2368 commits

Author SHA1 Message Date
Shadows_of_Fire
c5dbd778bb git forgot this 2018-01-12 17:47:01 -05:00
Shadows_of_Fire
426b363f8e clarity on oil recipe numbers 2018-01-12 17:46:38 -05:00
canitzp
31b3eaaf30 Redone some old code, tile entities are now saving their nbt to the itemstack again, also the MeeCreeps integration does work now Closes #998 2018-01-05 14:38:06 +01:00
Shadows_of_Fire
ce8061261b grow some more to account for speed loss 2018-01-04 14:51:19 -05:00
Shadows_of_Fire
beef72d35d remove greenhouse glass tile entity
I am not sure if this is faster or slower than the old tile entity, but
it certainly is more performant.  Numbers may be adjusted to try and fix
what the old speed was (every 50 ticks)
2018-01-04 14:40:58 -05:00
Shadows_of_Fire
4493a687ce make aiot accept sword enchantments 2018-01-04 14:27:16 -05:00
Shadows_of_Fire
8a1ed7b14b remove explicit tesla support
tesla api is ded and this will be more work for 1.13 so rip af
2017-12-23 15:20:01 -05:00
Shadows_of_Fire
0400298510 update forge 2017-12-23 00:51:45 -05:00
Shadows_of_Fire
953401d0af r126 2017-12-18 07:20:39 -05:00
Shadows_of_Fire
1954da6edb Closes #985
Actually added a feature for once! (Enchanted book splitting)
Added a transformHook in LensConversionRecipe
Made the booklet have max stack size of 1
Moved the text over a bit on reconstructor recipe pages
2017-12-12 01:54:15 -05:00
leomil72
9388605e24 Italian localization (#986)
Added Italian localization
2017-12-12 00:16:43 -05:00
Shadows_of_Fire
b05ffcd0b6 r125 2017-12-06 16:34:09 -05:00
Shadows_of_Fire
348b1eb92c Better check 2017-12-06 16:25:10 -05:00
Shadows_of_Fire
213716fc46 Block harvesting until tema uses new getDrops 2017-12-06 15:59:18 -05:00
Shadows_of_Fire
da573459cb Update state when dropper gui closes (fixes #972) 2017-12-02 13:38:36 -05:00
Shadows_of_Fire
2a751355d7 Adds Sack Blacklist (Closes #974)
also apparently the common capabilities maven is throwing 403's so i've
set it to the version in my cache.
2017-12-01 16:19:52 -05:00
Shadows_of_Fire
872e124cd8 bleh 2017-11-30 11:13:58 -05:00
Shadows_of_Fire
3bbf2c3d4a Ensure holding of the sack. Closes #975 2017-11-30 02:58:30 -05:00
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