Commit graph

67 commits

Author SHA1 Message Date
drcrazy
305f74b107 Storage blocks flattened 2018-09-12 16:56:24 +03:00
Modmuss50
6060a97855
Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep
# Conflicts:
#	src/main/java/techreborn/api/fluidreplicator/FluidReplicatorRecipe.java
#	src/main/java/techreborn/client/container/ContainerPda.java
#	src/main/java/techreborn/client/gui/TRBuilder.java
#	src/main/java/techreborn/compat/crafttweaker/CTFusionReactor.java
#	src/main/java/techreborn/compat/crafttweaker/CTGeneric.java
#	src/main/java/techreborn/compat/jei/RecipeUtil.java
#	src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java
#	src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeCategory.java
#	src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeCategory.java
#	src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeCategory.java
#	src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeCategory.java
#	src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeCategory.java
#	src/main/java/techreborn/compat/jei/compressor/CompressorRecipeCategory.java
#	src/main/java/techreborn/compat/jei/distillationTower/DistillationTowerRecipeCategory.java
#	src/main/java/techreborn/compat/jei/extractor/ExtractorRecipeCategory.java
#	src/main/java/techreborn/compat/jei/fluidReplicator/FluidReplicatorRecipeCategory.java
#	src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeCategory.java
#	src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeWrapper.java
#	src/main/java/techreborn/compat/jei/grinder/GrinderRecipeCategory.java
#	src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeCategory.java
#	src/main/java/techreborn/compat/jei/industrialElectrolyzer/IndustrialElectrolyzerRecipeCategory.java
#	src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeCategory.java
#	src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeCategory.java
#	src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeCategory.java
#	src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeCategory.java
#	src/main/java/techreborn/init/ModBlocks.java
#	src/main/java/techreborn/init/ModTileEntities.java
#	src/main/java/techreborn/init/recipes/CraftingTableRecipes.java
#	src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java
#	src/main/java/techreborn/items/tools/ItemAdvancedDrill.java
#	src/main/java/techreborn/packets/PacketAutoCraftingTableLock.java
#	src/main/resources/assets/techreborn/lang/en_us.lang
#	src/main/resources/assets/techreborn/loot_tables/chests/abandoned_mineshaft.json
#	src/main/resources/assets/techreborn/loot_tables/chests/desert_pyramid.json
#	src/main/resources/assets/techreborn/loot_tables/chests/igloo_chest.json
#	src/main/resources/assets/techreborn/loot_tables/chests/jungle_temple.json
#	src/main/resources/assets/techreborn/loot_tables/chests/simple_dungeon.json
#	src/main/resources/assets/techreborn/loot_tables/chests/village_blacksmith.json
2018-09-05 17:49:49 +01:00
drcrazy
a05ba25f31 Flattened upgrades 2018-09-04 13:26:09 +03:00
drcrazy
a40635e75f Renamed ModItems to TRItems. Sorted members inside it. 2018-09-03 17:46:21 +03:00
drcrazy
33b9f697dc Merged all ingredients into single class 2018-09-03 14:49:59 +03:00
drcrazy
f44aa92093 Removed unused imports 2018-08-27 17:52:26 +03:00
drcrazy
db4dbdc956 UU-matter is now part of parts enum 2018-08-27 15:48:41 +03:00
drcrazy
8f7cc291bd OreDict partially back, same for some recipes 2018-08-27 15:28:26 +03:00
drcrazy
8987311694 Flattened parts 2018-08-27 13:26:56 +03:00
drcrazy
de45f3e68d SmallDusts flattened 2018-08-24 15:56:53 +03:00
drcrazy
2939ee02a3 Flattened nuggets 2018-08-23 15:20:57 +03:00
drcrazy
337a500a5c Coolant part also craftable from water cells 2018-08-13 15:35:30 +03:00
modmuss50
2910acc29c
Remove META_PLACEHOLDER 2018-07-20 22:36:38 +01:00
modmuss50
b65e963f12
Move all mod compatibility out into its own mod, ic2 support is gone and will come back in some more basic form once ic2 is on 1.13
The new mod compatibility will be included (either shaded or jar-in-jar) in the main TR distrubtion, this has been done to aid development
2018-07-19 10:48:37 +01:00
Eric Chai
ca9a2c9b38 Corrected the ADVANCED_JACKHAMMER recipe () 2018-06-20 11:45:47 +03:00
ProfessorProspector
1ebf67d933 Add Silk Touch to the rock cutter in the recipe and creative tab, so it's more obvious of what it does 2018-06-16 10:27:19 -07:00
modmuss50
0536ef08a0
Fix some final issues with the slabs + add recipes 2018-06-09 11:32:02 +01:00
drcrazy
e834ba390d Updated industrial electrolyzer crafting recipe. 2018-06-01 14:18:06 +03:00
drcrazy
2658401aca Made craft for data storage circuit more balanced. 2018-04-20 15:45:02 +03:00
drcrazy
fef10740ba
Feature/fluidreplicator ()
Added Fluid Replicator multiblock machine.
2018-04-12 15:42:12 +03:00
modmuss50
d948db1b7f Possible fix for 2018-03-06 21:07:49 +00:00
drcrazy
a80d3eb9ca Removed duplicate recipe for Distillation tower 2018-02-19 18:21:10 +03:00
modmuss50
9c7f1995a8
Update year in license 2018-02-11 14:08:13 +00:00
drcrazy
af755a9f6e Changed carbon fiver recipe to shaped. Closes 2018-01-12 01:13:44 +03:00
drcrazy
9fafbf1ed4 Changed TR solar panel to use paneGlass. Closes 2018-01-11 13:55:54 +03:00
modmuss50
2a0a9e5636 Merge remote-tracking branch 'remotes/origin/1.12' into feature-alarm 2018-01-08 17:45:29 +00:00
Dimmerworld
86d37514a7 Recipe for alarm and misc fixes 2018-01-03 15:17:20 +11:00
Modmuss50
cbcb465c97
Added support for individual slot configuration
* start work on slot config

* More slot work

* More gui work for slot config

* Remove old sided code

* More slot work

* More slot memes

* Stuff seems to be working :)

* Start work on auto input / output

* Slot IO check boxes now work

* Fix buttons at different screen resolutions

* Improve close button

* Gui polish

* Fix multiblock hologram rendering

* More fixes + changes

* Cleanup + output fix
2017-12-25 00:18:43 +00:00
drcrazy
a419189926 Added dust->ingot<->block recipes for several materials. Closes 2017-12-08 16:43:04 +03:00
drcrazy
b2d2be24c6 Updated recipies and fixed build 2017-11-30 16:46:11 +03:00
drcrazy
5f2ddec821 Un-oredicted frame for grinder recipe. Closes 2017-11-08 02:05:07 +03:00
Alistair Buxton
c6ac9110fe Implement powered lighting. 2017-11-04 07:31:07 +00:00
drcrazy
57151a6f67 Brought back upgrades recipes in IC2 dedup mode. Closes 2017-10-24 12:21:10 +03:00
drcrazy
7d7340111d Added Distillation tower. Closes 2017-10-16 15:52:10 +03:00
drcrazy
47134cf2ab Added plasma generator. Some work on 2017-10-13 03:20:34 +03:00
Dimmerworld
28010d0790 Make scrapboxinator great again!
Fix input/output
Greatly reduced process time
Removed any sign of upgrades
Remove WIP tag
Add crafting recipe 
Cleaned up unused imports

Recipe:
(ironplate|circuit|ironplate)
(dirt|scrapbox|dirt)
(ironplate|circuit|ironplate)
2017-10-04 21:02:51 +11:00
drcrazy
4ce046a2ac Added recipe for DragonEgg Syphon 2017-09-29 01:08:31 +03:00
drcrazy
30ee947c22 Added player detector recipe. Removed unused imports 2017-09-07 03:17:40 +03:00
drcrazy
8588a40474 Added plateIridiumAlloy. Closes . Closes 2017-09-06 02:38:07 +03:00
drcrazy
71a0ac3e66 Updated recipe to use or not use oreDict names. Closes 2017-09-05 23:40:40 +03:00
drcrazy
021a6b0077 Fix for name format. Closes 2017-09-01 18:40:33 +03:00
drcrazy
46f9266197 Magnalium plate is back. Closes 2017-08-31 03:02:00 +03:00
modmuss50
20e9276bd9
Fixes 2017-08-30 21:25:13 +01:00
drcrazy
efbd5542b4 Code unification 2017-08-30 10:19:54 +03:00
drcrazy
e814a1bf3b More refactoring for recipes. Also closes and and () 2017-08-23 17:10:06 -07:00
drcrazy
f465c6cf47 Refactored Crafting Table recipies; Fixed IDE warnings for unused ()
imports; Update CoFH deps to fix build
2017-08-21 14:25:13 -07:00
modmuss50
dc966c0d83
Fixes broken recipes, closes 2017-07-28 21:01:08 +01:00
modmuss50
b0987a3ae0
Remove invalid recipes, closes 2017-07-04 16:56:53 +01:00
modmuss50
83a1bddf9e
Add recipes for some things that are missing them 2017-07-01 13:33:55 +01:00
modmuss50
9a7ffce98e
Nerf windmill recipes, closes 2017-07-01 11:57:02 +01:00