Commit graph

672 commits

Author SHA1 Message Date
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
82c9d00f97
Added recipe for endstone dust, closes #989
(cherry picked from commit 96d8220)
2017-03-13 11:01:41 +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
f392cd4290
Fix issues with getting item stacks, Closes #940 and fixes a bunch of other stuff 2017-01-31 12:33:00 +00:00
modmuss50
12f23f6434
Add a recipe for clay dust into the grinder, closes #945 2017-01-31 12:29:18 +00:00
modmuss50
0872a802da
Update to support new item power. 2017-01-18 09:55:24 +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
modmuss50
8b24fdf765
Merge remote-tracking branch 'remotes/origin/feature/containers-builder' into 1.11.2
# Conflicts:
#	src/main/java/techreborn/client/container/ContainerAlloyFurnace.java
#	src/main/java/techreborn/tiles/TileAlloyFurnace.java
2017-01-10 19:34:17 +00:00
ProfessorProspector
af91263621 Chemical reactor GUI & a couple recipe fixes 2017-01-09 16:54:48 -08:00
modmuss50
2ec7340383
Added better checks to ore dict, Closes #894 2017-01-08 21:58:32 +00:00
ProfessorProspector
49ae0045aa Fix a few recipes 2017-01-07 00:29:19 -08:00
ProfessorProspector
61688e1d62 Actually call mixed metal ingot recipes #releaseBuild Fixes #890 2017-01-07 00:05:08 -08:00
modmuss50
039cab23eb
Fixes some final issues with ic2 de-duplication, closes #875 2017-01-05 21:22:33 +00:00
ProfessorProspector
56b8b346f0 The Great Refactor of 2017 - make things more abstract 2017-01-05 13:16:51 -08: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
cf6fbb5ddc Remove debug lines and make tools children of item/handheld. 2017-01-02 15:31:28 -08:00
Prospector
f88f0f3cdb Fix cell outputs and lang 2017-01-02 15:14:09 -08:00
Prospector
c4b003f946 Localize Compressed Air and Electrolyzed Water 2017-01-02 13:24:53 -08:00
Prospector
a29006cae2 Electrolyzed Water recipe 2017-01-02 13:20:57 -08:00
Prospector
8bd1660c41 Remove duplicate recipe and fix bonemeal recipe in electrolyzer 2017-01-02 13:18:37 -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
73f362bf76 Actually fix gems ore dict 2016-12-21 17:08:13 -08:00
ProfessorProspector
948d4de3ad Fix block ore dictionary names 2016-12-21 16:41:33 -08:00
ProfessorProspector
1759199601 Remove debug code 2016-12-21 16:22:34 -08:00
ProfessorProspector
011f164bd7 Fix gem ore dictionary entries 2016-12-21 16:20:34 -08:00
ProfessorProspector
78a3d1f589 Revert ore dictionary commit which said it fixed it but actually broke it :P #releaseBuild 2016-12-21 15:59:27 -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
10ef977fd9
Fix ore dic names, closes #853 2016-12-20 14:08:15 +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
601194685b Merge 1.10 changes, bump version for #releaseBuild 2016-12-13 11:53:33 +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
modmuss50
0d7e26e74a Remove log, and add small dusts to ore dict 2016-12-12 17:54:20 +00:00
modmuss50
29f40e1f98 Add plate recipes based of ore dic 2016-12-12 15:53:04 +00:00
modmuss50
27862b0a28 Add some more recipes listed in #818 2016-12-12 15:29:25 +00:00
modmuss50
59b7610227 Fix extractor recipe allowing any wood for sap extraction, close #381 again 2016-12-12 09:22:19 +00:00
ProfessorProspector
49f227ca81 MORE JSONS: UU matter, upgrades, scrapboxes, and rubber sapling! Also fix rubber sapling model 2016-12-11 17:27:39 -08:00
ProfessorProspector
8012abee3b Move dusts and smalldusts to json 2016-12-11 11:34:56 -08:00
ProfessorProspector
3da6083c68 Nuggets now use jsons, and nuggets now return proper subtypes 2016-12-11 10:58:20 -08:00
ProfessorProspector
5186f3d0ae #releaseBuild 2016-12-10 15:04:24 -08:00
ProfessorProspector
9e3372c5aa remove debug line 2016-12-10 15:00:53 -08:00
ProfessorProspector
d510b24599 Fix improper plate ore dictionary entries 2016-12-10 15:00:20 -08:00
ProfessorProspector
7e0b84360c Fix ore dict recipes 2016-12-10 14:27:37 -08:00
ProfessorProspector
2911e7f0ca Move ingots, plates, and gems to jsons 2016-12-10 00:15:39 -08:00
ProfessorProspector
226c0bc619 Improve energy bars on items 2016-12-08 18:39:49 -08:00
modmuss50
3f8128d890 Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11 #betabuild
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/client/container/ContainerAlloyFurnace.java
#	src/main/java/techreborn/items/tools/ItemWrench.java
2016-12-07 13:52:48 +00:00
modmuss50
695ca83896 Fix drill recipes, closes #819 2016-12-07 13:27:20 +00:00
modmuss50
a42cf2990f Fix recipes, without silicon 2016-12-05 13:04:21 +00:00
modmuss50
463740ac99 Rename method to reflect the 1.11 changes. 2016-12-05 11:19:37 +00:00
modmuss50
d53f4dafc1 Added extra validation to recipe inputs and outputs, fixed one bug because of it. 2016-12-05 11:18:30 +00:00
modmuss50
72f85d5243 Auto format code. 2016-12-05 10:48:21 +00:00
modmuss50
a96c094267 Removed un used block. 2016-12-05 10:21:17 +00:00
modmuss50
8379115c97 Fix Machine Casings 2016-12-05 10:17:39 +00:00
modmuss50
c661f6b278 Fix Machine Casing Model 2016-12-05 10:07:41 +00:00
modmuss50
2fdce5405b Improve block names 2016-12-05 09:40:55 +00:00
modmuss50
1dbc56f739 Remove old redundantt blocks, you should be able to safely ingore the warning when loading 1.10.2 worlds(Still have a backup). 2016-11-28 13:01:30 +00:00
modmuss50
83ef3e7577 Start of new texturesm, again 2016-11-28 12:54:44 +00:00
modmuss50
e16c3eba02 Auto format 2016-11-25 13:25:51 +00:00
modmuss50
528fecc2b5
Fix a load of null issues, and get it to sort of work. 2016-11-19 16:36:13 +00:00
modmuss50
65e651f402
It compiles, disable JEI as it needs redoing 2016-11-19 14:41:00 +00:00
modmuss50
a0e6a2dc34
Start on the update 2016-11-19 12:50:08 +00:00
modmuss50
e0118c4cf3
Version 1.4.10
Disabled flares they can come later
2016-11-06 20:26:58 +00:00
brad18
f5172ee496
Update ModRecipes.java (#787)
Brings Cupronickel heating coil recipe into line with Gregtech MC 1.4.7 and fixes #783
2016-11-06 20:14:29 +00:00
modmuss50
d9d8845d6d
Added flare, still needs some textures 2016-11-06 19:14:43 +00:00
modmuss50
d75120bb00
Give more fluids power values 2016-11-05 17:55:50 +00:00
modmuss50
0dd3b725ce
Fix recipe crash 2016-11-05 16:53:22 +00:00
modmuss50
dda189fbc6
Add Electric Treetap & Make sap go directly into inventory : From: 2aa69a1425eb8928d530c58e7c8a2495e71ea78f 2016-11-05 16:33:27 +00:00
ProfessorProspector
31a901cf89
fix another gem thing 2016-11-05 16:25:47 +00:00
ProfessorProspector
3073a19cfa
Fix gem tools and armour recipes 2016-11-05 16:25:32 +00:00
modmuss50
73095ca198
Fix startup crash when adding some recipes. 2016-11-04 20:10:19 +00:00
modmuss50
271a8f2b2b
Fix ingot->dust dupe bug
Fix RC version not working in dev
2016-11-04 20:09:35 +00:00
modmuss50
19f1e71ac4
Fix #772
# Conflicts:
#	src/main/java/techreborn/init/ModRecipes.java
2016-11-04 20:07:41 +00:00
3Pixel
3b9e48a345
Fixed the blast Furnace recipe (#781)
does not use superconductors now. instead it uses the same recipe as the 1.9.4 branch which is cupronickel Heating coils instead of superconductors...
# Conflicts:
#	src/main/java/techreborn/init/ModRecipes.java

# Conflicts:
#	src/main/java/techreborn/init/ModRecipes.java
2016-11-04 20:05:41 +00:00
3Pixel
e19f1c6ca9 Fixed the blast Furnace recipe (#781)
does not use superconductors now. instead it uses the same recipe as the 1.9.4 branch which is cupronickel Heating coils instead of superconductors...
2016-10-18 00:14:18 +01:00
modmuss50
fdb506ad15
Remove some config settings that break things, fixes #732 2016-10-08 21:56:24 +01:00