Commit graph

4311 commits

Author SHA1 Message Date
modmuss50
92b3bc6651 Possible solution for #1798 2019-08-20 16:44:25 +01:00
modmuss50
6114f45d9b Cleanup + remove some TODO's that dont apply anymore 2019-08-20 15:15:26 +01:00
modmuss50
6174506d6c Fix #1802 2019-08-20 15:06:09 +01:00
modmuss50
17665e7400 Merge remote-tracking branch 'origin/1.14' into 1.14.4 2019-08-20 14:36:55 +01:00
modmuss50
e437838c12 Fix small issue with blast furnace 2019-08-20 14:36:46 +01:00
drcrazy
fee7d69919 Add heat to REI 2019-08-20 03:44:54 +03:00
drcrazy
21d77a2d7d Lava now works for blast furnace. Closes #1800 2019-08-20 02:52:16 +03:00
drcrazy
5bac19e302 tags for rolling machine + some REI polishing 2019-08-20 00:01:38 +03:00
drcrazy
f682142ef7 Fix biofuel model 2019-08-19 23:23:07 +03:00
modmuss50
05d95915e5 Dont jar in jar, it breaks some stuff 2019-08-19 20:41:30 +01:00
modmuss50
39ea95ec9e #betaBuild 2019-08-19 20:39:53 +01:00
modmuss50
0d0d2b23d5 Include RC in the TR jar 2019-08-19 20:24:31 +01:00
modmuss50
33556c8262 Fix #1796 2019-08-19 20:23:32 +01:00
modmuss50
a30e86b4cb Minor cleanup 2019-08-19 20:09:07 +01:00
modmuss50
e4c9005e23 Add recipes for the 2 new machines 2019-08-19 20:04:12 +01:00
modmuss50
20517d4c32 Wire Mill 2019-08-19 19:51:05 +01:00
modmuss50
066d1bc9e2 Remove all awt usage 2019-08-19 14:40:02 +01:00
Daniel She
f0b8d99853 Update to REI 3.0-pre (#1793)
* Update to REI 3.0-pre

* Update fabric.mod.json
2019-08-19 14:26:47 +01:00
modmuss50
c03d99f11f Fix #1797 recipe.fits is client only for some reason :D 2019-08-19 14:26:25 +01:00
modmuss50
456afac70a Texture updates 2019-08-19 14:07:58 +01:00
modmuss50
740a0ddecc EV Transformer 2019-08-19 13:58:35 +01:00
modmuss50
5511b598d7 Solid Canning Machine 2019-08-19 13:52:42 +01:00
modmuss50
2d34ebc480 Biofuel 2019-08-19 13:30:15 +01:00
modmuss50
aab3a02184 cleanup config field names 2019-08-18 17:09:10 +01:00
modmuss50
d7d7eeb2ed #betaBuild 2019-08-18 16:04:58 +01:00
modmuss50
2d64004171 Fix superconductors overflowing 2019-08-18 15:59:58 +01:00
modmuss50
0bcf782f57 Fix AESU and Fusion control buttons 2019-08-18 15:54:25 +01:00
modmuss50
7f8bd2ab1f Fix electric furnace not always turning off 2019-08-18 15:31:21 +01:00
modmuss50
926063ffcf Fix manual gui. Closes #1792 2019-08-18 15:23:24 +01:00
modmuss50
64b3441d6d Fix Electric Furnace not checking if there is room for the outputs 2019-08-18 15:13:49 +01:00
modmuss50
f53d65ca48 Fixes #1785 2019-08-18 14:36:06 +01:00
modmuss50
bfb8d81367 Fix ingredients not always using the correct amount of items 2019-08-18 14:30:59 +01:00
modmuss50
d585b298fb Fix some issues with the fluid handling of items 2019-08-18 14:22:45 +01:00
drcrazy
3eec5bcb5b Added some recipe texts to REI. Looks ugly 2019-08-16 14:18:48 +03:00
drcrazy
3e5965ad57 Fix progress bar for electric furnace 2019-08-15 21:14:42 +03:00
drcrazy
9035e4376a Fix for #1782, cheap basic tools and fixed some warnings here and there 2019-08-14 17:15:34 +03:00
drcrazy
dc8511f1f0 Fix armor textures 2019-08-14 14:04:49 +03:00
modmuss50
047e4b7401 #betaBuild 2019-08-13 22:11:45 +01:00
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