Commit graph

274 commits

Author SHA1 Message Date
modmuss50
f7c2d85a62 Fix #753 Stops invalid items being added to the scrapbox 2016-09-27 18:30:03 +01:00
modmuss50
7b162009c2 Hide Quantum chest and tanks when quantumstorage is loaded 2016-09-27 17:50:34 +01:00
modmuss50
a5550b9bb4 Fix a load of issues 2016-09-19 20:58:34 +01:00
modmuss50
edf266588f Fix wrench recipe issues
Remove fluid pipe
Add recipe to switch rubber
Fix some missing textures
2016-09-16 22:56:21 +01:00
Zygimantas
bda861454c fixed #722 (#729)
* 3 Pyrite dusts in an Industrial Electrolyzer gives 1 Iron dust and 2 Sulfur dust

* referenced to issue #484, fixed #1, #3, #6, #7

* Fixed #722 with a null ore check
2016-08-10 21:57:38 +01:00
Zygimantas
cf46fea074 Electrolyzer recipes (#728)
* 3 Pyrite dusts in an Industrial Electrolyzer gives 1 Iron dust and 2 Sulfur dust

* referenced to issue #484, fixed #1, #3, #6, #7
2016-08-10 20:33:49 +01:00
modmuss50
d96149fc97 Revert "Power system re-write, recipe fixes."
This reverts commit d982cc4028.

# Conflicts:
#	src/main/java/techreborn/init/ModRecipes.java
2016-08-10 00:51:44 +01:00
Dragon2488
42d051cda3 Veins ore generation + fixes. 2016-08-01 20:59:20 +07:00
Dragon2488
5af14bbf01 Grinder recipes fixes and auto-generation for ores, gems and ingots through ore dictionary 2016-07-29 01:28:59 +07:00
Dragon2488
b42b5274b5 Multiblock fixes (compressor, freezer, grinder), grinder recipes fixes, freezer JEI recipe show fix. 2016-07-25 02:26:15 +07:00
Dragon2488
0011553cf7 Sawmill changes & fixes. 2016-07-24 01:10:37 +07:00
modmuss50
10aa2f2ffb fix merge 2016-07-19 11:46:53 -07:00
al132
7a6df30d10 Rubber and recipe fixes 2016-07-18 23:26:41 -05:00
Dragon2488
d982cc4028 Power system re-write, recipe fixes.
Please note that this version breaks all wires placed in worlds before.
2016-07-18 11:57:52 +07: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
1f197c3728 Properly integration with IC2 through ore dictionary. JEI recipes energy usage and time descriptions. 2016-07-15 17:28:41 +07: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
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
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
onVoid
83e116f4b5 Added grinder recipes for ingot -> dust 2016-06-05 12:36:39 -07:00
modmuss50
4d29af274e Balance power recipes 2016-06-05 19:43:17 +01:00
modmuss50
bd00b44ab0 Balance power recipes 2016-06-05 11:23:20 +01:00
modmuss50
1a0fb02516 Added config to disable gem tools and armour, closes #617 2016-06-04 11:20:06 +01:00
Yulife
9cbebe6dbd Shoo IC2 Exp, Shoo 2016-05-30 16:11:40 +02:00
Prospector
216e801bec Closes #401 2016-05-28 12:40:11 -07:00
modmuss50
f39a047f49 Fixes #481 and Fixes empty cell texture 2016-05-25 17:23:19 +01:00
modmuss50
e01e4be209 Added the code to show all unused items in recycler recipes 2016-05-25 17:06:12 +01:00
modmuss50
135e3e3be2 Fixes #483 2016-05-25 16:57:50 +01:00
modmuss50
e532a0b276 Fixes #568 2016-05-25 16:53:27 +01:00
modmuss50
1ab33a9473 Use new file server, add more checks to recipes 2016-05-25 11:07:42 +01:00
modmuss50
25ee0b5790 Remove old cells, now uses the DynamicCell, 9 new fluids that need a texture 2016-05-23 18:26:21 +01:00
Prospector
188e2ef0c5 Fix tool tiers 2016-05-23 00:13:11 -07:00
Prospector
be36455415 Rename to tungstenGrindingHead 2016-05-22 14:01:38 -07:00
modmuss50
a24ee95c4d Fix crash when reloading texture 2016-05-22 21:20:39 +01:00
Yulife
54106e082d Relocation of assets, TINY DUSTS 2016-05-22 17:19:05 +02:00
modmuss50
161eb87246 Remove voidstone, does NOT break worlds 2016-05-22 14:53:56 +01:00
modmuss50
7e2db4a715 Rewrote fluids
Now uses json files
Now uses forge bucket
Now not broken, closes #557
2016-05-17 18:36:51 +01:00
modmuss50
aaeb67f9c4 Fixes #583 2016-05-17 10:28:06 +01:00
modmuss50
89d9dc99e2 Fixes #381 rubber ore dic issue 2016-05-16 16:04:31 +01:00
Prospector
3cf950d491 Shift-Right click on non-block to clear freq. transmitter and advanced drill/chainsaw recipes. 2016-05-15 21:24:35 -07:00
modmuss50
dd6e69bea5 Start work on fluid pipes 2016-05-09 11:13:52 +01:00
Prospector
a6cfd90339 get tinkers in the dev env (no compat yet) 2016-05-08 10:26:40 -07:00
modmuss50
140b03960e Fixes #557 2016-05-08 09:24:16 +01:00
modmuss50
a060c33e5a Fixes #522 2016-05-07 13:45:33 +01:00
modmuss50
4095a0b52d Auto update mappings 2016-05-06 22:13:24 +01:00
Prospector
44f2588b4e Update JEI compat 2016-04-30 20:01:10 -07:00