Commit graph

17 commits

Author SHA1 Message Date
modmuss50
7b99e2e9b7 License updates + fixes 2020-01-03 22:46:07 +00:00
drcrazy
5e9e0f3c2b Omnitool WIP mark lost 2019-12-20 16:34:42 +03:00
modmuss50
bfdde04892 1.15-pre2 loads of new mappings 2019-11-26 19:03:36 +00:00
modmuss50
977ac8f8a8 merge fixes 2019-11-14 19:09:32 +00:00
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
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
drcrazy
666e8f03b2 Fix crash with lamp 2019-09-16 12:53:09 +03: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
edf4c3f287 Fixes #1758 2019-08-12 22:31:41 +01:00
drcrazy
56d1d196f0 Items use energy to do work. Closes #1770 2019-08-12 00:41:44 +03:00
drcrazy
d80bf3a1ce Update import to a proper one 2019-08-08 02:17:18 +03:00
drcrazy
d0dedc6893 Cleanup 2019-07-22 02:43:22 +03:00
drcrazy
d6788c8da5 Moved misc blocks to their own package. Start of rubber stuff 2019-07-15 17:24:31 +03:00
Renamed from src/main/java/techreborn/blocks/BlockRubberLog.java (Browse further)