Commit graph

278 commits

Author SHA1 Message Date
ProfessorProspector
0b963dcda9 Continue to make sense of things... this mod's a mess lol 2018-09-16 20:31:01 -07:00
ProfessorProspector
e5736669ca Refactoring & cleaning 2018-09-16 13:48:51 -07:00
Modmuss50
3444c05c40
IInventory > IItemHandler
Most things should work, but havent been tested
Slot config will not work just yet
2018-09-07 14:05:19 +01: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
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
db4dbdc956 UU-matter is now part of parts enum 2018-08-27 15:48:41 +03:00
Modmuss50
84aeeb978c
Fix most modded fluids not working in our machines 2018-08-11 20:08:44 +01:00
modmuss50
f5c6b59ebd
Mappings 2018-07-20 22:31:20 +01:00
modmuss50
95b49e5e23
Move some stuff around in RC 2018-07-20 22:02:46 +01:00
modmuss50
f78abb1a21
Remove some old stuff 2018-07-20 21:55:29 +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
drcrazy
fef10740ba
Feature/fluidreplicator (#1482)
Added Fluid Replicator multiblock machine.
2018-04-12 15:42:12 +03:00
modmuss50
ec56914ea7
Add logic to lock rolling machine, allows it to be automated. Closes #1412 2018-04-05 12:37:31 +01:00
modmuss50
da6016b692 Cleanup recipe ore dict setting. #1455 2018-03-19 09:41:20 +00:00
modmuss50
f1a3387fbf
Add extractor support to craft tweaker 2018-03-10 19:50:24 +00:00
modmuss50
3b914e658c Allow using ore dict entries in CraftTweaker Closes #1396 2018-03-06 21:28:05 +00:00
drcrazy
111ee7630a Updated API reference for recipes. 2018-03-05 14:45:23 +03:00
modmuss50
9c7f1995a8
Update year in license 2018-02-11 14:08:13 +00:00
modmuss50
3fe260b739
Revert "Add a config to lock the rolling machine recipe + some optimisations #1412"
This reverts commit 0b8f139
2018-02-11 14:01:24 +00:00
modmuss50
0b8f139e6d Add a config to lock the rolling machine recipe + some optimisations #1412 2018-01-31 13:47:48 +00:00
modmuss50
af57ef708d Fixes #1426 2018-01-31 09:46:26 +00:00
drcrazy
e4736447bd RecipeCrafter for scrapboxinator 2018-01-19 18:08:27 +03:00
drcrazy
44b6f20357 Updated scrapboxinator to crafter and new GUI. 2018-01-19 18:07:52 +03:00
drcrazy
c69b9f46b6 Added ability to remove fluidgenerator recipe via CT. Closes #1404 2018-01-19 11:17:36 +03:00
drcrazy
ca9508c381 Deprecated ScrapboxList. 2018-01-17 13:57:40 +03:00
drcrazy
376f02df26 Updated Sawmill GUI and TileEntity. 2017-12-13 12:29:39 +03:00
drcrazy
779551cf70 Fixed JavaDoc and CTScrapbox warnings 2017-11-27 17:55:29 +03:00
drcrazy
25d561c81c Fixed imports and suppressed recipe warnings. 2017-11-10 12:27:31 +03:00
drcrazy
441ac4887a Made Cloaking device wearable in 1.12. Closes #1314 2017-10-20 01:58:35 +03:00
drcrazy
7d7340111d Added Distillation tower. Closes #884 2017-10-16 15:52:10 +03:00
drcrazy
47134cf2ab Added plasma generator. Some work on #884 2017-10-13 03:20:34 +03:00
modmuss50
ffe13d0c79 Update rolling machine CT support for 1.12 closes #1251 2017-09-27 13:45:49 +01:00
drcrazy
8de19ff5e7 Fix warnings 2017-09-14 17:55:28 +03:00
modmuss50
b18f99a4dd Fix server crash 2017-09-11 09:28:45 +01:00
drcrazy
b13d282bf1 Fix unused imports 2017-09-09 01:54:43 +03:00
modmuss50
faddc0089e
Fix rollingmachine closes #1174 2017-07-02 18:12:57 +01:00
modmuss50
f1c5a0ad8d
Large bunch of recipe work, still shapedOreRecipes need fixing. 2017-06-14 22:50:20 +01:00
modmuss50
df62000513
Found some more null itemstacks 2017-06-13 11:26:08 +01:00
modmuss50
b25742dde0
Auto format code 2017-06-12 14:23:32 +01:00
modmuss50
29cf9fa90b
1.12 2017-06-11 21:22:07 +01:00
Prospector
ad36dfcddb Started redoing config 2017-06-08 11:45:30 -07: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
995f28642a
Remove unused classes 2017-04-13 11:52:51 +01:00
modmuss50
34978f7ffe Remove old upgrade handler to make way for the new one. 2017-04-11 00:12:36 +01:00
modmuss50
5231e1d93b
Fix Industrial Grinder getting stuck at 100%, closes #1004 2017-03-15 09:59:23 +00:00
modmuss50
d126edaa1b
Fixes #981 2017-02-23 12:38:36 +00:00
modmuss50
26c208e811
Added license info to the header of all files. 2017-02-23 12:29:43 +00:00
modmuss50
6aa8fde64a
Update to support updated recipe format in reborn core. 2017-01-08 21:43:15 +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