Commit graph

1745 commits

Author SHA1 Message Date
modmuss50
fbc0d32407 Fix rare crash with the power net 2016-07-16 23:44:42 +01:00
modmuss50
adf9b8c0e4 Fix #676 2016-07-16 22:16:22 +01:00
Dragon2488
25c581e129 Recipe fixes. 2016-07-16 22:17:44 +07:00
Dragon2488
33df1d3319 Implemented Lightning Rod, improved ore dictionary integration for dusts, nuggets and plates. Plates now registers automatically for every gem and ingot in TR. (#673) 2016-07-16 10:44:54 +01:00
Prospector
ddb96d58ec Merge pull request #672 from Dragon2488/1.9.4
Properly integration with IC2 through ore dictionary. JEI recipes...
2016-07-15 04:05:16 -07:00
Dragon2488
1f197c3728 Properly integration with IC2 through ore dictionary. JEI recipes energy usage and time descriptions. 2016-07-15 17:28:41 +07:00
Prospector
31d1afa044 Merge pull request #671 from Dragon2488/1.9.4
Properly fluid rendering in dynamic cells. Temporary fix of recipes incapability…
2016-07-14 22:39:43 -07:00
Dragon2488
2b148f3d68 Properly fluid rendering in dynamic cells. Temporary fix of recipes incapability with renamed (or tagged) cells. Merge dynamic and empty cells into one item. Right click on fluid block fills cell with fluid. 2016-07-15 12:15:09 +07:00
al132
01516c93a3 Fix CraftTweaker compatibility
A version of CraftTweaker that is compatible with 1.9.4 has been
released since the Minetweaker/CraftTweaker dependency was removed. I
have restored compatibility with the new version of CraftTweaker
2016-07-14 17:15:36 -05:00
modmuss50
7719633599 Added compatibility for 1.10 2016-07-01 15:58:15 +01:00
modmuss50
fa9e941217 Update JEI 2016-07-01 15:55:44 +01:00
modmuss50
315c0aa509 Revert "Revert a shit load of stuff"
This reverts commit d25bb23e8e.
2016-07-01 15:55:37 +01:00
modmuss50
d25bb23e8e Revert a shit load of stuff 2016-07-01 15:40:46 +01:00
modmuss50
be336ec249 Fix ChargeHud 2016-06-06 20:22:56 +01:00
modmuss50
2c6cc4b298 Clean up ic2 recipes a little 2016-06-06 19:59:10 +01:00
modmuss50
7d0943ea5b Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn into 1.9.4
# Conflicts:
#	src/main/java/techreborn/init/ModRecipes.java
2016-06-06 19:55:04 +01:00
modmuss50
9c0f0fa111 Started work on the recipe links 2016-06-06 19:52:46 +01:00
modmuss50
973f68496c Merge branch '1.9.4' into 1.9.4-ic2
# Conflicts:
#	src/main/java/techreborn/init/ModRecipes.java
2016-06-06 19:02:19 +01:00
onVoid
039aab3e41 Added grinder recipes for gems -> dust (#628) 2016-06-05 22:05:44 +01:00
modmuss50
55e6f70900 Fix last PR 2016-06-05 20:41:54 +01:00
Modmuss50
d5e83cacb6 Merge pull request #626 from onVoid/patch-1
Added grinder recipes for ingot -> dust
2016-06-05 20:38:44 +01:00
modmuss50
d84bffce46 Fix nanosaber 2016-06-05 20:37:22 +01:00
onVoid
83e116f4b5 Added grinder recipes for ingot -> dust 2016-06-05 12:36:39 -07:00
modmuss50
895319ed67 Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn into 1.9.4 2016-06-05 19:43:28 +01:00
modmuss50
4d29af274e Balance power recipes 2016-06-05 19:43:17 +01:00
Prospector
b7e6e109aa Nanosaber still don't work 2016-06-05 10:41:00 -07:00
Prospector
4c01fa8864 Started work on fixing nanosaber 2016-06-05 03:57:38 -07:00
modmuss50
bd00b44ab0 Balance power recipes 2016-06-05 11:23:20 +01:00
Prospector
a719a1c563 Holy huge commit with unhelpful name batman!
-Added TRNoDestroy (for items that do not use JSONDestroyer)
-Batteries now use item overrides to display different texture when empty
-Fixed diamond nugget unity texture
-Removed new fluid sources from JEI
-Fixed empty cell lang entry
2016-06-05 01:33:40 -07:00
modmuss50
90ca45dce9 Broken work 2016-06-04 20:20:04 +01:00
modmuss50
87f6ea1eb0 Ic2 recipes? 2016-06-04 20:07:34 +01:00
modmuss50
0bbc088524 No longer shows the RF bar on our machines 2016-06-04 18:20:37 +01:00
modmuss50
eaae9a380d Add ic2 to dev env, and attempt to fix a world gen crash 2016-06-04 18:04:30 +01:00
modmuss50
d80280b110 Fix random world gen crash - Fix electric furnace and version bump 2016-06-04 17:03:22 +01:00
modmuss50
207d42d81b The One Probe support 2016-06-04 14:53:16 +01:00
modmuss50
246113dfca Fix generator being overpowered 2016-06-04 14:28:36 +01:00
Modmuss50
ae2e063440 Update TileBatBox.java 2016-06-04 14:22:48 +01:00
modmuss50
77eddc31b2 More lang for tool tips, closes #610 2016-06-04 11:40:52 +01:00
modmuss50
c968cd3b2e Update forge
Update mappings
Update Tinkers support - Closes #614
2016-06-04 11:31:53 +01:00
modmuss50
1a0fb02516 Added config to disable gem tools and armour, closes #617 2016-06-04 11:20:06 +01:00
modmuss50
d3bd2bf70b Add a safety check to close #619 2016-06-04 11:14:34 +01:00
modmuss50
8a8fd59cc1 Add a way to rename and move the blockstates json file 2016-06-04 11:02:35 +01:00
Yulife
b09e60f774 Electrolyzer 2016-06-02 21:31:58 +02:00
Yulife
1380724d10 Industrial Sawmill 2016-06-02 19:21:53 +02:00
modmuss50
fff952cb1a Fix pipe types 2016-06-01 12:30:20 +01:00
modmuss50
7f377b042d Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn into 1.9.4 2016-06-01 12:07:01 +01:00
modmuss50
96235d2c9d Uses Reborncores version of MCMP 2016-06-01 12:06:51 +01:00
Yulife
9cbebe6dbd Shoo IC2 Exp, Shoo 2016-05-30 16:11:40 +02:00
Yulife
8b09c72255 s 2016-05-30 14:18:43 +02:00
Yulife
9f0298b9d5 Nugget Removal 2016-05-30 14:04:17 +02:00