Commit graph

3350 commits

Author SHA1 Message Date
modmuss50
81aee77869
Fix energy storage blocks not rotating 2017-06-29 16:03:22 +01:00
modmuss50
67acfaaab9
Merge remote-tracking branch 'origin/1.12' into 1.12 2017-06-29 15:50:04 +01:00
modmuss50
4207532ded
Fixes https://github.com/TechReborn/TechReborn/issues/1160 2017-06-29 15:49:34 +01:00
Modmuss50
09c6b731a9 Update README.md 2017-06-29 14:41:57 +01:00
modmuss50
86bee5639c
Bump version #releaseBuild 2017-06-29 13:28:30 +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
327bba2775
Merge remote-tracking branch 'origin/1.12' into 1.12 2017-06-29 12:40:41 +01:00
modmuss50
0e8505b072
Remove reminents of core mod + fix powered items 2017-06-29 12:37:06 +01:00
Modmuss50
fc29fefffa #releaseBuild 2017-06-28 23:03:30 +01:00
modmuss50
68b40927c8
Disable it for now 2017-06-28 22:43:48 +01:00
modmuss50
1f2b8a8bf9
I almost give up 2017-06-28 22:33:09 +01:00
modmuss50
4031763a3a
Remove debug ouput 2017-06-28 22:31:29 +01:00
modmuss50
779467ea01
Fix? 2017-06-28 22:29:01 +01:00
modmuss50
7209e08f87
try fix build? 2017-06-28 22:10:43 +01:00
modmuss50
5f63bb7b5a
Might fix build? 2017-06-28 21:14:47 +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
c89aaaed7a
Initial removal of core mod 2017-06-28 15:20:18 +01:00
modmuss50
a37f724fa7
Some more work on getting mixins injected into the jar 2017-06-28 13:31:56 +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
ea81e66c87
Update ic2 dep 2017-06-28 09:02:48 +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
3a83b81100
Bump version, #releaseBuild 2017-06-24 20:28:35 +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
modmuss50
2ae312581f
Bump version, #releaseBuild 2017-06-23 11:23: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
modmuss50
06abf4e413
Merge branch 'Nourepide-1.12' into 1.12 2017-06-22 18:23:20 +01:00
modmuss50
cbd4125ae2
merge 2017-06-22 18:22:49 +01:00
Nourepide
81f9d46b88 Language: Fixing missing names and removing unused code 2017-06-22 20:47:42 +04:00
Nourepide
8e14aae53b Settings language fix (#1145) 2017-06-22 16:07:55 +01:00
Nourepide
56ab571f6d Settings language fix 2017-06-22 19:05:08 +04:00
bogger33
2c9b808670
add dustAsh oreDict recipe (#1128)
(cherry picked from commit 61ad7ee)
2017-06-22 13:05:08 +01:00
modmuss50
df047a9ee7
Bump version, #betaBuild 2017-06-22 13:00:54 +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
modmuss50
04721e447d
Start work on intelligent item insertion. 2017-06-21 20:26:56 +01:00
modmuss50
43d741d4b6
Fix language names 2017-06-21 17:39:52 +01:00
modmuss50
24efcf057f
Fix lesu missing texture. 2017-06-21 17:36:36 +01:00