modmuss50
|
426001251f
|
Merge branch '1.12' of https://github.com/TechReborn/TechReborn into 1.12
# Conflicts:
# src/main/java/techreborn/init/ModRecipes.java
|
2017-06-14 23:30:35 +01:00 |
|
modmuss50
|
f1c5a0ad8d
|
Large bunch of recipe work, still shapedOreRecipes need fixing.
|
2017-06-14 22:50:20 +01:00 |
|
Prospector
|
40e3062903
|
Continue the great refactor of mid 2017 (A lot of stuff still broken, it's a WIP)
|
2017-06-14 08:56:09 -07:00 |
|
modmuss50
|
b7e141e004
|
More config changes
|
2017-06-12 20:33:30 +01:00 |
|
modmuss50
|
cf5ed6afa0
|
Remove stupid/unused configs
|
2017-06-12 14:39:06 +01:00 |
|
modmuss50
|
b25742dde0
|
Auto format code
|
2017-06-12 14:23:32 +01:00 |
|
modmuss50
|
ae5b07d6bb
|
Fixes a handfull of recipe issues in FTB Beyond, closes #1021
(cherry picked from commit eef08aa)
|
2017-06-02 20:13:03 +01:00 |
|
modmuss50
|
2c16bf58b7
|
Update license header
|
2017-06-02 19:35:51 +01:00 |
|
drcrazy
|
74f798e9c3
|
Rolling machine fixes (#1075)
* Fix for issue #942
|
2017-05-02 18:38:16 +01:00 |
|
Dimmerworld
|
4d4a6e6fac
|
Add Glowstone grinder recipe (#1060)
* Added Glowstone dust grinder recipe
|
2017-04-15 08:25:20 +01:00 |
|
modmuss50
|
8530cb7d7b
|
Load saw mill recipes later to make sure other mods have added their recipes before ours.
|
2017-04-08 15:58:21 +01:00 |
|
drcrazy
|
b136a534aa
|
Industrial Sawmill support for JEI done
|
2017-04-08 01:52:29 +03:00 |
|
modmuss50
|
76332ee946
|
Fixes some recipes not using the ore dict correctly.
(cherry picked from commit 3ee81c2)
|
2017-03-13 11:02:56 +00:00 |
|
modmuss50
|
26c208e811
|
Added license info to the header of all files.
|
2017-02-23 12:29:43 +00:00 |
|
Jim Groth
|
3bee9245f8
|
Added grinder recipe for endstone.
|
2017-02-02 03:51:58 +01:00 |
|
modmuss50
|
12f23f6434
|
Add a recipe for clay dust into the grinder, closes #945
|
2017-01-31 12:29:18 +00:00 |
|
modmuss50
|
a172c6aabe
|
Add coal to the grinder.
|
2017-01-16 10:03:58 +00:00 |
|
modmuss50
|
9e02f1ff35
|
Add config to disable railcraft steel recipe.
|
2017-01-16 10:01:00 +00:00 |
|
modmuss50
|
2a632ac265
|
Fix some recipe issues, closes #899
|
2017-01-14 16:53:49 +00:00 |
|
modmuss50
|
2c60034a88
|
Update to new RebornCore. Added a config setting to disable railcrafts Iron Nugget to Steel Nugget recipe.
|
2017-01-11 15:33:34 +00:00 |
|
ProfessorProspector
|
49ae0045aa
|
Fix a few recipes
|
2017-01-07 00:29:19 -08:00 |
|
modmuss50
|
039cab23eb
|
Fixes some final issues with ic2 de-duplication, closes #875
|
2017-01-05 21:22:33 +00:00 |
|
ProfessorProspector
|
e86c0d175c
|
The Great Refactor of 2017 - More recipes moved over!
|
2017-01-05 13:14:24 -08:00 |
|
modmuss50
|
a0c3cc644a
|
Add MissingIngredientExpection
|
2017-01-05 21:11:44 +00:00 |
|
ProfessorProspector
|
2ad33bd6a9
|
The Great Refactor of 2017 - Remove old Plate Cutting Machine stuff, move UU matter and cable recipes over, fix industrial grinder eu usage, clean up EnumStandaloneCableType, move Fluid Generator, Rolling Machine, Scrapbox, and Smelting recipes over. Add some alternative rolling recipes for metal recipes that are more efficient.
|
2017-01-04 14:19:41 -08:00 |
|
Prospector
|
1215c47fc2
|
The Great Refactor of 2017 - Extractor Recipes
|
2017-01-03 09:32:55 -08:00 |
|
Prospector
|
bd4103b7df
|
The Great Refactor of 2017 - Industrial Centrifuge Recipes
|
2017-01-03 00:33:25 -08:00 |
|
Prospector
|
1831ff4dbc
|
The Great Refactor of 2017 - Implosion Compressor Recipes
|
2017-01-02 18:00:14 -08:00 |
|
Prospector
|
206b20ac9e
|
The Great Refactor of 2017: Electrolyzer Edition
|
2017-01-02 13:08:58 -08:00 |
|
Prospector
|
007c6ca38a
|
Add a use for bauxite and continue the great refactor of 2017
|
2017-01-01 19:32:53 -08:00 |
|
Prospector
|
6a70424252
|
Continue the "Great refactor of 2017". Massive variable name refactoring and start splitting crafting table recipes to their own class.
|
2016-12-31 23:29:32 -08:00 |
|
ProfessorProspector
|
c24116e259
|
Redo all Industrial Grinder recipes, and move them to a separate class (Here starts the great recipe cleanup of 2017!)
|
2016-12-30 23:45:42 -08:00 |
|
ProfessorProspector
|
9b73f20ad0
|
Fix lazurite plate recipe. not ready for a new build yet
|
2016-12-30 14:49:31 -08:00 |
|
modmuss50
|
b2d070c7f3
|
Fix compile errors, and bump forge to 1.11.2
|
2016-12-27 19:47:54 +00:00 |
|
modmuss50
|
0922e0b886
|
Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
# Conflicts:
# build.gradle
# src/main/java/techreborn/init/IC2Dict.java
# src/main/java/techreborn/init/ModRecipes.java
# src/main/java/techreborn/init/OreDict.java
|
2016-12-26 23:49:42 +00:00 |
|
ProfessorProspector
|
415660c988
|
Tweak how nugget recipes are done once again, and \o/ 2500th commit!
|
2016-12-22 15:12:13 -08:00 |
|
ProfessorProspector
|
2e9bf11569
|
Fix nuggets -> ingot recipes
|
2016-12-22 14:40:24 -08:00 |
|
ProfessorProspector
|
68d5a49d75
|
Add iridium reinforced stone & tungstensteel block recipes
|
2016-12-22 14:39:10 -08:00 |
|
ProfessorProspector
|
a446c76397
|
Add nuggets -> ingot and ingot -> nuggets recipes
|
2016-12-22 14:33:21 -08:00 |
|
ProfessorProspector
|
948d4de3ad
|
Fix block ore dictionary names
|
2016-12-21 16:41:33 -08:00 |
|
modmuss50
|
7a6b3b6b48
|
Added a config to allow the de-duplication of ic2 items. When this is enabled TR will require you to use ic2's recipes. #releaseBuild
|
2016-12-21 17:57:36 +00:00 |
|
modmuss50
|
936ee13686
|
Remove last duplicated items.
|
2016-12-21 17:44:44 +00:00 |
|
modmuss50
|
5ff09a7eda
|
Some more work on deduplicating ic2 items/blocks
|
2016-12-21 17:31:52 +00:00 |
|
modmuss50
|
3e6fc0647f
|
Fix crash with certain mods, closes #854
|
2016-12-20 14:02:21 +00:00 |
|
modmuss50
|
bfcc3a2117
|
Initial work on IC2 de-duplication
|
2016-12-18 21:36:29 +00:00 |
|
Ourten
|
97192ee3f4
|
Add the unified FluidGenerator recipe system + Restructure FluidGenerators tiles
They should all be pretty now
|
2016-12-17 01:25:32 +01:00 |
|
modmuss50
|
57720c61de
|
Fix Iridum Recipe, fixes #792
|
2016-12-14 10:10:07 +00:00 |
|
modmuss50
|
ee96908775
|
Disable recipe, to fix crash with a certain set of mods. #releaseBuild
|
2016-12-13 19:19:12 +00:00 |
|
modmuss50
|
a3b4e9de6e
|
Merge 1.10, bump version for #releaseBuild
|
2016-12-13 11:51:33 +00:00 |
|
ProfessorProspector
|
c271422e11
|
Remove deprecated empty cell
|
2016-12-12 15:57:04 -08:00 |
|