Commit graph

4273 commits

Author SHA1 Message Date
drcrazy
b0576e3aba Charge powered items from chest armor 2019-08-13 21:20:41 +03:00
drcrazy
6282e1f714 Filter fluids input for fluid generators. 2019-08-13 21:00:28 +03:00
drcrazy
8f94d3484b Should fix Plasma Generator for #1780 2019-08-13 19:43:36 +03:00
drcrazy
0fa30e2381 Rename armor texture 2019-08-13 18:33:42 +03:00
modmuss50
bedae13e2a #betaBuild 2019-08-13 16:30:44 +01:00
modmuss50
442dfde50f Add some hardness to more blocks, Fixes #1779 2019-08-13 16:28:21 +01:00
modmuss50
eca7aaa34f add a Towelette plugin to blacklist our fluids, fixes the game not loading 2019-08-13 16:24:24 +01:00
modmuss50
75d9bccd6a Merge branch '1.14' of https://github.com/TechReborn/TechReborn into 1.14.4 2019-08-13 15:53:56 +01:00
modmuss50
35bb2df90e First pass on ISDU rewrite, uses RC's new DataAttachment system 2019-08-13 15:53:50 +01: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
2a6a91fa87 Make carbon mesh shapeless 2019-08-13 13:53:28 +03:00
drcrazy
54813ecdc3 Bumped modloader + recipes + lang for buckets 2019-08-13 13:51:44 +03:00
modmuss50
5e33977d6a Add carbon mesh recipe, fixes #1777 2019-08-13 11:49:34 +01:00
modmuss50
ff8b497c54 Fix thermal generator 2019-08-13 11:45:25 +01:00
modmuss50
c17c49249a #betaBuild 2019-08-12 23:47:10 +01:00
modmuss50
158d8acd21 Tags in recipes
Not a lot I could do about the reformat of jsons
2019-08-12 23:38:16 +01:00
modmuss50
b1545b3021 Tags, stage 1 2019-08-12 22:59:13 +01:00
modmuss50
11b2a3f68e Update ore textures, closes #1768 2019-08-12 22:40:00 +01:00
modmuss50
edf4c3f287 Fixes #1758 2019-08-12 22:31:41 +01:00
modmuss50
832844b438 Merge branch '1.14' of https://github.com/TechReborn/TechReborn into 1.14.4 2019-08-12 22:29:02 +01:00
modmuss50
5c54358aa2 Cleanup 2019-08-12 22:28:53 +01:00
drcrazy
1f9bfabf21 Removed unused imports 2019-08-12 22:04:24 +03:00
modmuss50
3e1cf7d40a Fix bad rename 2019-08-12 19:52:58 +01: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
modmuss50
2a5708b328 Rolling machine port/fixes 2019-08-12 15:05:49 +01:00
drcrazy
1dd83875ef Add item tags. Closes #1767 2019-08-12 01:08:11 +03: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
drcrazy
4012a69fab Fix Iron Furnace GUI 2019-08-11 23:56:43 +03:00
modmuss50
a906fad739 #betaBuild 2019-08-09 00:26:47 +01:00
modmuss50
b975c302d8 Recipe time and power re-balance 2019-08-09 00:19:00 +01:00
modmuss50
6f35d5b527 remove euPerFU 2019-08-08 23:47:58 +01:00
modmuss50
9022746771 Add rubber planks to tag 2019-08-08 23:41:29 +01:00
modmuss50
2edffead05 update to use fabric api's offical event 2019-08-08 23:35:27 +01:00
modmuss50
a5bbb602f7 Dont crash with the rolling machine, wont work just yet. 2019-08-08 23:27:43 +01:00
modmuss50
2bda5c6ce4 Remove block drop overrides, it will come back later and use jsons or something :D 2019-08-08 23:25:10 +01:00
modmuss50
05d449faac Fixes #1765 2019-08-08 23:17:53 +01:00
modmuss50
2ba06391f5 #betaBuild fix BE's not being loaded at the correct time 2019-08-08 21:18:48 +01:00
modmuss50
e0fb6042d8 Fix server crash #betaBuild 2019-08-08 14:27:21 +01:00
modmuss50
861e79a398 #betaBuild 2019-08-08 13:52:02 +01:00
modmuss50
a7d069d48c Fix build 2019-08-08 13:47:59 +01:00
modmuss50
ac2e224afe Make the machines louder so you can actually hear them. Fixes #1755 2019-08-08 13:45:02 +01:00
modmuss50
2415040add Fix sawmill hologram offset. Closes #1750 2019-08-08 13:30:24 +01:00
modmuss50
981b9fa13b Add endores back 2019-08-08 13:22:01 +01:00
modmuss50
74dd0f0be6 Fix electric tree tap recipe. Closes #1756 2019-08-08 12:33:09 +01:00
modmuss50
7217e84358 Scrapbox fixes and recipes. Closes #1752 2019-08-08 12:30:09 +01:00
modmuss50
a08ee3d17a Fix manual crashing the game, closes #1754 2019-08-08 11:49:11 +01:00
modmuss50
02c823986a Fix optifine crash, still some incompatibilities with shaders. Closes #1749 2019-08-08 11:33:12 +01:00