Commit graph

605 commits

Author SHA1 Message Date
modmuss50
d5e89c5e20 Merge remote-tracking branch 'remotes/origin/1.14' into 1.15
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/blocks/misc/BlockRubberLog.java
2019-11-14 19:03:36 +00:00
modmuss50
a984263b04 inital 19w46a port 2019-11-14 18:37:42 +00:00
modmuss50
371c1fe21b Fix #1859 2019-10-18 19:52:21 +01:00
drcrazy
264224a6f9 Stripped version of Rubber Log. 2019-10-08 13:03:01 +03:00
modmuss50
7f4fb6d80b Cleanup 2019-09-22 13:01:34 +01:00
modmuss50
2d8961589d Merge remote-tracking branch 'remotes/origin/1.14' into 1.15
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/client/render/DynamicBucketBakedModel.java
#	src/main/java/techreborn/client/render/DynamicCellBakedModel.java
2019-09-21 12:36:37 +01:00
modmuss50
a4a578917d Update energy api 2019-09-16 23:11:56 +01:00
modmuss50
aa6eb60d46 Finish porting to new power api 2019-09-15 19:14:42 +01:00
modmuss50
8c9c736da9 19w37a 2019-09-12 16:55:41 +01:00
modmuss50
4f80a8c651 start on new power api 2019-09-10 14:09:15 +01:00
modmuss50
aa5d81dbe8 Fix the nano saber might needs its numbers tweaked. Closes #1816 2019-08-26 20:00:59 +01:00
drcrazy
026dedd2e6 Refactoring for Iron Furnace 2019-08-26 19:03:01 +03:00
drcrazy
154dff4cbf Unused imports + warnings ) 2019-08-22 01:23:32 +03:00
modmuss50
49b42752a1 Fix some server crashes 2019-08-21 19:39:10 +01:00
modmuss50
6114f45d9b Cleanup + remove some TODO's that dont apply anymore 2019-08-20 15:15:26 +01:00
modmuss50
33556c8262 Fix #1796 2019-08-19 20:23:32 +01:00
modmuss50
aab3a02184 cleanup config field names 2019-08-18 17:09:10 +01:00
drcrazy
dc8511f1f0 Fix armor textures 2019-08-14 14:04:49 +03:00
drcrazy
b0576e3aba Charge powered items from chest armor 2019-08-13 21:20:41 +03:00
drcrazy
f9023d7b0f Itemgroup filler moved to init utils. 2019-08-13 17:02:34 +03:00
drcrazy
62f1c521f0 Jackhammer should work 2019-08-13 15:04:19 +03:00
drcrazy
1f9bfabf21 Removed unused imports 2019-08-12 22:04:24 +03:00
modmuss50
77eee6f5b4 Move configs to one class 2019-08-12 17:57:00 +01:00
modmuss50
9db1978410 Finish porting all recipes to json, cleanup a lot of old code 2019-08-12 15:37:45 +01:00
drcrazy
207751996b Fix crash with wrench. Closes #1771 2019-08-12 00:58:00 +03:00
drcrazy
56d1d196f0 Items use energy to do work. Closes #1770 2019-08-12 00:41:44 +03:00
modmuss50
e0fb6042d8 Fix server crash #betaBuild 2019-08-08 14:27:21 +01:00
modmuss50
a08ee3d17a Fix manual crashing the game, closes #1754 2019-08-08 11:49:11 +01:00
drcrazy
d80bf3a1ce Update import to a proper one 2019-08-08 02:17:18 +03:00
modmuss50
423f5ebab4 Cells can now pick up and place fluids 2019-08-07 20:52:59 +01:00
modmuss50
ab0b6bc2fa Make obstinate happy 2019-08-07 20:24:13 +01:00
modmuss50
9c9c5f7ac9 A few more recipes 2019-07-30 20:02:40 +01:00
modmuss50
aafc42784a Fix Industrial Drill 2019-07-29 16:14:17 +01:00
modmuss50
2308ed0f05 Fix power durability display 2019-07-29 16:02:14 +01:00
modmuss50
b89a52e594 Fluid color in cell changes color based on biome's water color + some other fixes and changes 2019-07-28 17:29:01 +01:00
modmuss50
0da3168bbf Fluid ingredients + some other work around this area 2019-07-28 17:14:38 +01:00
modmuss50
6a93c3fd46 more misc fluid work, gonna leave most of this untill we have an offical or new api 2019-07-24 19:06:21 +01:00
modmuss50
8964c5aceb Basic Dynamic cell rendering 2019-07-24 01:37:05 +01:00
modmuss50
9b46e3237e move to silk fluids 2019-07-23 21:30:57 +01:00
modmuss50
83bf6add1e Large amount of fluid work 2019-07-23 20:46:07 +01:00
modmuss50
dbc89adaf7 Tile -> BlockEntity + some more refactors 2019-07-22 12:45:13 +01:00
drcrazy
d0dedc6893 Cleanup 2019-07-22 02:43:22 +03:00
drcrazy
7977a8e73b Few warnings and moar recipes 2019-07-18 01:32:37 +03:00
drcrazy
4f1593771e Fixed imports 2019-07-15 10:59:08 +03:00
modmuss50
18950e0b29 1.14.3 + more recipe fixes 2019-07-01 00:24:12 +01:00
modmuss50
f8f20ce6ba 1.14.2 2019-06-13 13:14:11 +01:00
modmuss50
6b9f6cb4f8 it compiles :D 2019-06-12 19:29:04 +01:00
modmuss50
500ff29dbd 377 2019-06-04 12:13:15 +01:00
modmuss50
d18d1b820e 397 2019-06-04 12:05:18 +01:00
modmuss50
e8396dbc33 831, doesnt seem impossible 2019-05-27 22:21:58 +01:00