drcrazy
|
f465c6cf47
|
Refactored Crafting Table recipies; Fixed IDE warnings for unused (#1241)
imports; Update CoFH deps to fix build
|
2017-08-21 14:25:13 -07:00 |
|
drcrazy
|
aa2d15c109
|
Fix for issue #1218 - Can't Macerate Basalt or Marble (#1224)
|
2017-08-02 00:29:12 +01:00 |
|
modmuss50
|
dc966c0d83
|
Fixes broken recipes, closes #1208
|
2017-07-28 21:01:08 +01:00 |
|
modmuss50
|
f4a641f3cb
|
Fix crash with malisis mods, #releaseBuild Fixes #1199
|
2017-07-19 18:23:45 +01:00 |
|
modmuss50
|
c926f41237
|
Fix small issue with ore dict utils
|
2017-07-10 18:38:30 +01:00 |
|
modmuss50
|
b4f1031d44
|
Should fix crash with industrial foregoing
|
2017-07-10 18:32:34 +01:00 |
|
modmuss50
|
2206c7688a
|
One ingot -> 1 plate, closes #1188
|
2017-07-08 19:01:03 +01:00 |
|
modmuss50
|
de323b847a
|
Add Pyrotheum to fluid gen + clean up fluid handling, closes #1054
|
2017-07-07 00:02:14 +01:00 |
|
modmuss50
|
cead631367
|
Added a generous amount of recipes into thermal expansion, close #1110
|
2017-07-06 23:49:00 +01:00 |
|
modmuss50
|
41312c86a5
|
Add redgarnet recipe
|
2017-07-06 22:23:14 +01:00 |
|
modmuss50
|
b0987a3ae0
|
Remove invalid recipes, closes #1183
|
2017-07-04 16:56:53 +01:00 |
|
modmuss50
|
2529f3fd9a
|
Try and prevent invalid ore dict names being registered
|
2017-07-01 19:27:07 +01:00 |
|
modmuss50
|
83a1bddf9e
|
Add recipes for some things that are missing them
|
2017-07-01 13:33:55 +01:00 |
|
modmuss50
|
b803f1762a
|
Improve machine sound
|
2017-07-01 13:03:04 +01:00 |
|
modmuss50
|
6995f42924
|
Work on machine sounds
|
2017-07-01 12:28:57 +01:00 |
|
modmuss50
|
5efd8daab1
|
Auto crafting table sound
|
2017-07-01 12:09:35 +01:00 |
|
modmuss50
|
9a7ffce98e
|
Nerf windmill recipes, closes #1154
|
2017-07-01 11:57:02 +01:00 |
|
modmuss50
|
2774407307
|
Fix solar panel recipe
|
2017-06-30 13:07:46 +01:00 |
|
modmuss50
|
0e8505b072
|
Remove reminents of core mod + fix powered items
|
2017-06-29 12:37:06 +01:00 |
|
modmuss50
|
774fec221e
|
Auto format code
|
2017-06-28 20:54:12 +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
|
36e85c82a3
|
Update to support reborn core mixin changes.
|
2017-06-26 23:00:43 +01:00 |
|
modmuss50
|
f56ffa9eed
|
Fix a bunch of issues with recipes
|
2017-06-25 14:15:01 +01:00 |
|
modmuss50
|
ba644982fe
|
Update to support new forge registry system
|
2017-06-24 20:15:49 +01:00 |
|
bogger33
|
2c9b808670
|
add dustAsh oreDict recipe (#1128)
(cherry picked from commit 61ad7ee)
|
2017-06-22 13:05:08 +01:00 |
|
modmuss50
|
944d2b7b5c
|
Fix some small issues
|
2017-06-21 16:35:15 +01:00 |
|
modmuss50
|
1bc724ebfc
|
Disable dev features by default
|
2017-06-20 22:04:39 +01:00 |
|
modmuss50
|
59a92a43c6
|
Remove "expensive" recipe configs, and they had no point to be there.
|
2017-06-20 22:01:00 +01:00 |
|
modmuss50
|
dd2e21d8bc
|
Fixes solar panel and grinder recipes. (will need to delete recipes config)
|
2017-06-20 21:59:26 +01:00 |
|
modmuss50
|
3071d19db0
|
Initial work on Auto crafting table.
|
2017-06-20 18:54:45 +01:00 |
|
Prospector
|
b80235504f
|
Fix the rest of the models & remove manual and heat generator
|
2017-06-16 08:20:30 -07:00 |
|
modmuss50
|
a701094d1d
|
Update all license headers
|
2017-06-15 12:28:26 +01:00 |
|
modmuss50
|
24faea17ba
|
Fixes issue in recipes + update forge
|
2017-06-15 12:07:03 +01:00 |
|
modmuss50
|
5536a6cd94
|
Recipes can now show in the recipe book
|
2017-06-15 11:01:33 +01:00 |
|
Prospector
|
bdcb8bf327
|
Merge branch '1.12' of https://github.com/TechReborn/TechReborn into 1.12
|
2017-06-15 00:01:51 -07:00 |
|
Prospector
|
cc27a1ed14
|
More WIP
|
2017-06-15 00:01:37 -07:00 |
|
modmuss50
|
5570a52539
|
Sawmill recipes work again
|
2017-06-14 23:50:49 +01:00 |
|
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 |
|
Prospector
|
1fa9f1cf52
|
Begin the Great Refactor of Mid-2017
|
2017-06-13 16:49:52 -07:00 |
|
modmuss50
|
708ccc758a
|
Mappings update
|
2017-06-13 22:07:49 +01: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
|
fc4d8686b8
|
Support RC changes
|
2017-06-12 14:19:16 +01:00 |
|
modmuss50
|
e0f63fd0c5
|
Try and fix cable inv rendering
|
2017-06-12 11:17:57 +01:00 |
|
modmuss50
|
624d8fb93a
|
Remove old cables
|
2017-06-12 10:55:26 +01:00 |
|
modmuss50
|
007e8714fa
|
Improvements to cables.
|
2017-06-12 10:47:38 +01:00 |
|
modmuss50
|
29cf9fa90b
|
1.12
|
2017-06-11 21:22:07 +01:00 |
|
modmuss50
|
f9d4134365
|
Start redoing Matter Fabricator gui
(cherry picked from commit 5c6bc6c)
|
2017-06-02 20:32:03 +01:00 |
|
modmuss50
|
be4df1d6c9
|
Fixes Industrial Electrolyzer not using the ore dict closes #1022
(cherry picked from commit f88c25a)
|
2017-06-02 20:13:34 +01:00 |
|
modmuss50
|
0a7e6ac92f
|
Fixes rubber sapling model Closes #943
(cherry picked from commit 0e94364)
|
2017-06-02 20:13:12 +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 |
|
modmuss50
|
d474870977
|
Initial work on standalone cables.
|
2017-05-19 13:12:02 +01:00 |
|
drcrazy
|
74f798e9c3
|
Rolling machine fixes (#1075)
* Fix for issue #942
|
2017-05-02 18:38:16 +01:00 |
|
modmuss50
|
3d55b435d4
|
Ic2 1.11.2 support
|
2017-04-21 09:09:28 +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 |
|
modmuss50
|
f2cbd23994
|
Find sawmill recipes from all other recipes.
|
2017-04-08 15:56:24 +01:00 |
|
modmuss50
|
833efcd574
|
Fixes #1023
|
2017-04-08 14:52:28 +01:00 |
|
drcrazy
|
b136a534aa
|
Industrial Sawmill support for JEI done
|
2017-04-08 01:52:29 +03:00 |
|
drcrazy
|
291eadfeed
|
More work for Sawmill
|
2017-04-07 18:22:37 +03:00 |
|
modmuss50
|
332fe1be48
|
Fixes crash when gem tools are disabled, closes #1008
|
2017-03-15 10:08:58 +00:00 |
|
modmuss50
|
92acc51aaf
|
Added a creative panel, it provides infinite power and has no recipe.
(cherry picked from commit 456ee3c)
|
2017-03-15 09:48:25 +00:00 |
|
modmuss50
|
8b80cb7562
|
De-Dupe Frequency Transmitter
(cherry picked from commit 127df1f)
|
2017-03-13 11:04:25 +00:00 |
|
modmuss50
|
35e104d901
|
Fixes issue with small dust recipes, closes #1005
(cherry picked from commit 80a387b)
|
2017-03-13 11:04:17 +00:00 |
|
modmuss50
|
bbf93c3ae3
|
Rewrite some of the logic behind the matter fabricator, now works with ic2 scrap as well.
Closes #1002 and Closes #822
(cherry picked from commit 93ccd8b)
|
2017-03-13 11:03:44 +00: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
|
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 |
|