Commit graph

2277 commits

Author SHA1 Message Date
modmuss50
d267bb4e09
Merge remote-tracking branch 'origin/1.12' into 1.12 2017-07-10 18:33:07 +01:00
modmuss50
b4f1031d44
Should fix crash with industrial foregoing 2017-07-10 18:32:34 +01:00
Eric Schneider
b178fd3442 Fixed grammar (#1192) 2017-07-09 13:13:15 +01:00
modmuss50
2206c7688a
One ingot -> 1 plate, closes #1188 2017-07-08 19:01:03 +01:00
modmuss50
de323b847a
Add Pyrotheum to fluid gen + clean up fluid handling, closes #1054 2017-07-07 00:02:14 +01:00
modmuss50
cead631367
Added a generous amount of recipes into thermal expansion, close #1110 2017-07-06 23:49:00 +01:00
modmuss50
41312c86a5
Add redgarnet recipe 2017-07-06 22:23:14 +01:00
modmuss50
b0987a3ae0
Remove invalid recipes, closes #1183 2017-07-04 16:56:53 +01:00
modmuss50
3e4cf9b93f
Fix server kicking client when using the saw mill, closes #1182 #releaseBuild 2017-07-03 21:51:17 +01:00
modmuss50
79a8fa647b
Rewrite the sawmill logic, fixes #1180 2017-07-03 20:26:55 +01:00
modmuss50
407aa3ed66
Fixes #1177 2017-07-03 19:52:28 +01:00
modmuss50
1e890ab79e
Fixes #1178 2017-07-03 19:48:21 +01:00
modmuss50
3625521c20
Fixes #1179 2017-07-03 19:12:11 +01:00
modmuss50
faddc0089e
Fix rollingmachine closes #1174 2017-07-02 18:12:57 +01:00
modmuss50
2529f3fd9a
Try and prevent invalid ore dict names being registered 2017-07-01 19:27:07 +01:00
modmuss50
83a1bddf9e
Add recipes for some things that are missing them 2017-07-01 13:33:55 +01:00
modmuss50
b803f1762a
Improve machine sound 2017-07-01 13:03:04 +01:00
modmuss50
6995f42924
Work on machine sounds 2017-07-01 12:28:57 +01:00
modmuss50
5efd8daab1
Auto crafting table sound 2017-07-01 12:09:35 +01:00
modmuss50
9a7ffce98e
Nerf windmill recipes, closes #1154 2017-07-01 11:57:02 +01:00
modmuss50
a952ad1fff
Fixes iron furnace sideded issues, closes #1166 2017-07-01 11:52:33 +01:00
modmuss50
0388f97873
Revert: Small improvements to the cables 2017-06-30 13:17:06 +01:00
modmuss50
2774407307
Fix solar panel recipe 2017-06-30 13:07:46 +01:00
modmuss50
3e5f02ab4e
Small improvements to the cables 2017-06-29 17:19:34 +01:00
modmuss50
5203ad5b01
Debug tool supports FU 2017-06-29 16:44:49 +01:00
modmuss50
81aee77869
Fix energy storage blocks not rotating 2017-06-29 16:03:22 +01:00
modmuss50
4207532ded
Fixes https://github.com/TechReborn/TechReborn/issues/1160 2017-06-29 15:49:34 +01:00
modmuss50
ae71797d28
Draw default background on GUI's might help fix some issues 2017-06-29 13:11:59 +01:00
modmuss50
9edbdf5016
Closes https://github.com/TechReborn/TechReborn/issues/1158 for now 2017-06-29 12:56:33 +01:00
modmuss50
0d4fced8bb
Fixes https://github.com/TechReborn/TechReborn/issues/1159 2017-06-29 12:50:23 +01:00
modmuss50
0e8505b072
Remove reminents of core mod + fix powered items 2017-06-29 12:37:06 +01:00
modmuss50
774fec221e
Auto format code 2017-06-28 20:54:12 +01:00
modmuss50
c0aab7f37a
Update crafttweaker support 2017-06-28 20:50:00 +01:00
modmuss50
425a8d2948
Remove 2nd pass of mixin loading, and attempt to fix mixin loading outside dev 2017-06-28 09:15:22 +01:00
modmuss50
36e85c82a3
Update to support reborn core mixin changes. 2017-06-26 23:00:43 +01:00
modmuss50
ac7a4246f6
Fixes the auto crafting table, as it broke a bit with the forge update. 2017-06-26 22:30:13 +01:00
modmuss50
f2c753cf1d
Update to new forge, #releaseBuild 2017-06-26 09:40:58 +01:00
modmuss50
f56ffa9eed
Fix a bunch of issues with recipes 2017-06-25 14:15:01 +01:00
modmuss50
a774b2bcb2
Update to support forge model changes, #releaseBuild 2017-06-25 13:56:39 +01:00
modmuss50
ba644982fe
Update to support new forge registry system 2017-06-24 20:15:49 +01:00
Nourepide
c8dfcb3ba5 Fix missing names in JEI (#1149)
* Fix missing names in GUI machines

* Fix missing names in JEI
2017-06-23 14:05:44 +01:00
Nourepide
4725541a4b Fix missing names in GUI machines (#1147) 2017-06-22 23:30:23 +01:00
modmuss50
138de281f4
Fixes issue with cable crafting, #betaBuild 2017-06-22 20:27:05 +01:00
bogger33
2c9b808670
add dustAsh oreDict recipe (#1128)
(cherry picked from commit 61ad7ee)
2017-06-22 13:05:08 +01:00
modmuss50
7bbb23c876
Fix drill being able to break bedrock, and slow it down slightly 2017-06-22 12:58:43 +01:00
modmuss50
8cf46ef273
Fix extracting from the auto crafting table. 2017-06-22 12:51:28 +01:00
modmuss50
b083d6b5fc
Fix custom recipe support 2017-06-22 12:46:02 +01:00
modmuss50
412d66593b
Large amount of work toward being able to place the recipe into the gui. 2017-06-22 00:29:57 +01:00
modmuss50
bee8d4aab0
Some minor fixes to the auto crafting table 2017-06-21 23:39:40 +01:00
modmuss50
ba99f70406
Auto fill grid in the correct patten 2017-06-21 23:31:40 +01:00