drcrazy
|
1f9bfabf21
|
Removed unused imports
|
2019-08-12 22:04:24 +03:00 |
|
modmuss50
|
9db1978410
|
Finish porting all recipes to json, cleanup a lot of old code
|
2019-08-12 15:37:45 +01:00 |
|
modmuss50
|
2a5708b328
|
Rolling machine port/fixes
|
2019-08-12 15:05:49 +01:00 |
|
modmuss50
|
7217e84358
|
Scrapbox fixes and recipes. Closes #1752
|
2019-08-08 12:30:09 +01:00 |
|
drcrazy
|
6d4ea13284
|
Fusion Reactor recipe start
|
2019-08-07 18:17:39 +03:00 |
|
drcrazy
|
ed5c2cc870
|
Removed unused imports
|
2019-08-07 13:10:02 +03:00 |
|
modmuss50
|
83483ce8d3
|
Fluid replicator
|
2019-08-06 20:56:52 +01:00 |
|
modmuss50
|
536de89742
|
Refactor tank recipes
|
2019-08-04 18:59:02 +01:00 |
|
drcrazy
|
255f277304
|
Should fix armor rendering
|
2019-08-01 14:34:43 +03:00 |
|
modmuss50
|
70279c1800
|
More fluid work
|
2019-07-31 19:37:17 +01:00 |
|
modmuss50
|
739f4c21e8
|
Fix multiplayer crashes
|
2019-07-31 17:34:53 +01:00 |
|
modmuss50
|
0118d5a999
|
Refactor machine ingredients
|
2019-07-28 14:50:06 +01:00 |
|
modmuss50
|
6a93c3fd46
|
more misc fluid work, gonna leave most of this untill we have an offical or new api
|
2019-07-24 19:06:21 +01:00 |
|
modmuss50
|
9b46e3237e
|
move to silk fluids
|
2019-07-23 21:30:57 +01:00 |
|
modmuss50
|
83bf6add1e
|
Large amount of fluid work
|
2019-07-23 20:46:07 +01:00 |
|
modmuss50
|
dbc89adaf7
|
Tile -> BlockEntity + some more refactors
|
2019-07-22 12:45:13 +01:00 |
|
modmuss50
|
7dc6dddc51
|
Refactor out inv wrapper
|
2019-07-01 00:39:13 +01:00 |
|
modmuss50
|
6b9f6cb4f8
|
it compiles :D
|
2019-06-12 19:29:04 +01:00 |
|
modmuss50
|
d18d1b820e
|
397
|
2019-06-04 12:05:18 +01:00 |
|
modmuss50
|
e8396dbc33
|
831, doesnt seem impossible
|
2019-05-27 22:21:58 +01:00 |
|
modmuss50
|
4e03ac893c
|
1147 - Initial auto mappings pass
|
2019-05-26 12:37:59 +01:00 |
|
drcrazy
|
a1fc56042a
|
Models for generators
|
2019-04-22 17:38:17 +03:00 |
|
modmuss50
|
1dad4697ba
|
Start moving everything over to the new system
|
2019-04-14 17:01:38 +01:00 |
|
modmuss50
|
4440c2f305
|
Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep
# Conflicts:
# build.gradle
# src/main/java/techreborn/TechReborn.java
# src/main/java/techreborn/blocks/BlockNuke.java
# src/main/java/techreborn/blocks/BlockOre.java
# src/main/java/techreborn/blocks/BlockRubberLog.java
# src/main/java/techreborn/blocks/generator/BlockSolarPanel.java
# src/main/java/techreborn/client/RegisterItemJsons.java
# src/main/java/techreborn/client/container/builder/BuiltContainer.java
# src/main/java/techreborn/client/container/builder/ContainerBuilder.java
# src/main/java/techreborn/client/container/builder/ContainerPlayerInventoryBuilder.java
# src/main/java/techreborn/client/container/builder/ContainerTileInventoryBuilder.java
# src/main/java/techreborn/client/container/builder/slot/FilteredSlot.java
# src/main/java/techreborn/client/container/builder/slot/SpriteSlot.java
# src/main/java/techreborn/client/container/builder/slot/UpgradeSlot.java
# src/main/java/techreborn/client/gui/GuiAESU.java
# src/main/java/techreborn/client/gui/GuiAlloySmelter.java
# src/main/java/techreborn/client/gui/GuiAssemblingMachine.java
# src/main/java/techreborn/client/gui/GuiBase.java
# src/main/java/techreborn/client/gui/GuiBlastFurnace.java
# src/main/java/techreborn/client/gui/GuiChemicalReactor.java
# src/main/java/techreborn/client/gui/GuiCompressor.java
# src/main/java/techreborn/client/gui/GuiDieselGenerator.java
# src/main/java/techreborn/client/gui/GuiDigitalChest.java
# src/main/java/techreborn/client/gui/GuiDistillationTower.java
# src/main/java/techreborn/client/gui/GuiElectricFurnace.java
# src/main/java/techreborn/client/gui/GuiExtractor.java
# src/main/java/techreborn/client/gui/GuiFluidReplicator.java
# src/main/java/techreborn/client/gui/GuiFusionReactor.java
# src/main/java/techreborn/client/gui/GuiGasTurbine.java
# src/main/java/techreborn/client/gui/GuiGenerator.java
# src/main/java/techreborn/client/gui/GuiGrinder.java
# src/main/java/techreborn/client/gui/GuiImplosionCompressor.java
# src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java
# src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java
# src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java
# src/main/java/techreborn/client/gui/GuiIronFurnace.java
# src/main/java/techreborn/client/gui/GuiManual.java
# src/main/java/techreborn/client/gui/GuiQuantumChest.java
# src/main/java/techreborn/client/gui/GuiRecycler.java
# src/main/java/techreborn/client/gui/GuiScrapboxinator.java
# src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java
# src/main/java/techreborn/client/gui/GuiThermalGenerator.java
# src/main/java/techreborn/client/gui/GuiVacuumFreezer.java
# src/main/java/techreborn/client/gui/TRBuilder.java
# src/main/java/techreborn/client/gui/slot/GuiFluidConfiguration.java
# src/main/java/techreborn/client/gui/slot/GuiSlotConfiguration.java
# src/main/java/techreborn/client/gui/slot/elements/CheckBoxElement.java
# src/main/java/techreborn/client/gui/slot/elements/ConfigSlotElement.java
# src/main/java/techreborn/client/gui/slot/elements/ElementBase.java
# src/main/java/techreborn/client/gui/slot/elements/FluidConfigPopupElement.java
# src/main/java/techreborn/client/gui/slot/elements/ISprite.java
# src/main/java/techreborn/client/gui/slot/elements/OffsetSprite.java
# src/main/java/techreborn/client/gui/slot/elements/SlotConfigPopupElement.java
# src/main/java/techreborn/client/gui/slot/elements/Sprite.java
# src/main/java/techreborn/compat/CompatManager.java
# src/main/java/techreborn/compat/ICompatModule.java
# src/main/java/techreborn/compat/jei/BaseRecipeWrapper.java
# src/main/java/techreborn/compat/jei/BuiltContainerTransferInfo.java
# src/main/java/techreborn/compat/jei/RecipeUtil.java
# src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java
# src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeWrapper.java
# src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeCategory.java
# src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeWrapper.java
# src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeWrapper.java
# src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeWrapper.java
# src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/compressor/CompressorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/distillationTower/DistillationTowerRecipeWrapper.java
# src/main/java/techreborn/compat/jei/extractor/ExtractorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/fluidReplicator/FluidReplicatorRecipeWrapper.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/generators/fluid/FluidGeneratorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/grinder/GrinderRecipeWrapper.java
# src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeWrapper.java
# src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeWrapper.java
# src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeCategory.java
# src/main/java/techreborn/compat/jei/scrapbox/ScrapboxRecipeCategory.java
# src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeWrapper.java
# src/main/java/techreborn/events/BlockBreakHandler.java
# src/main/java/techreborn/events/StackToolTipEvent.java
# src/main/java/techreborn/init/IC2Duplicates.java
# src/main/java/techreborn/init/ModItems.java
# src/main/java/techreborn/init/ModRecipes.java
# src/main/java/techreborn/init/OreDict.java
# src/main/java/techreborn/init/recipes/AlloySmelterRecipes.java
# src/main/java/techreborn/init/recipes/ChemicalReactorRecipes.java
# src/main/java/techreborn/init/recipes/CraftingTableRecipes.java
# src/main/java/techreborn/init/recipes/FusionReactorRecipes.java
# src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java
# src/main/java/techreborn/init/recipes/IndustrialSawmillRecipes.java
# src/main/java/techreborn/init/recipes/RollingMachineRecipes.java
# src/main/java/techreborn/init/recipes/ScrapboxRecipes.java
# src/main/java/techreborn/items/ItemDestructopack.java
# src/main/java/techreborn/items/ItemFrequencyTransmitter.java
# src/main/java/techreborn/items/ItemManual.java
# src/main/java/techreborn/items/ItemMissingRecipe.java
# src/main/java/techreborn/items/ItemScrapBox.java
# src/main/java/techreborn/items/ItemTechManual.java
# src/main/java/techreborn/items/ItemUUmatter.java
# src/main/java/techreborn/items/ItemUpgrade.java
# src/main/java/techreborn/items/ItemUpgrades.java
# src/main/java/techreborn/items/armor/ItemCloakingDevice.java
# src/main/java/techreborn/items/ingredients/ItemDusts.java
# src/main/java/techreborn/items/ingredients/ItemDustsSmall.java
# src/main/java/techreborn/items/ingredients/ItemGems.java
# src/main/java/techreborn/items/ingredients/ItemIngots.java
# src/main/java/techreborn/items/ingredients/ItemNuggets.java
# src/main/java/techreborn/items/ingredients/ItemParts.java
# src/main/java/techreborn/items/ingredients/ItemPlates.java
# src/main/java/techreborn/items/ingredients/ItemUUmatter.java
# src/main/java/techreborn/items/tool/ItemDebugTool.java
# src/main/java/techreborn/items/tool/ItemTreeTap.java
# src/main/java/techreborn/items/tool/basic/ItemElectricTreetap.java
# src/main/java/techreborn/items/tools/ItemTechManual.java
# src/main/java/techreborn/items/tools/ItemTreeTap.java
# src/main/java/techreborn/items/tools/ItemWrench.java
# src/main/java/techreborn/lib/ModInfo.java
# src/main/java/techreborn/proxies/ClientProxy.java
# src/main/java/techreborn/tiles/TileChargeOMat.java
# src/main/java/techreborn/tiles/TileChunkLoader.java
# src/main/java/techreborn/tiles/TileDigitalChest.java
# src/main/java/techreborn/tiles/TileIndustrialCentrifuge.java
# src/main/java/techreborn/tiles/TileMatterFabricator.java
# src/main/java/techreborn/tiles/TileQuantumChest.java
# src/main/java/techreborn/tiles/TileQuantumTank.java
# src/main/java/techreborn/tiles/cable/TileCable.java
# src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java
# src/main/java/techreborn/tiles/generator/TileCreativeSolarPanel.java
# src/main/java/techreborn/tiles/generator/TilePlasmaGenerator.java
# src/main/java/techreborn/tiles/generator/advanced/TileDieselGenerator.java
# src/main/java/techreborn/tiles/generator/advanced/TileGasTurbine.java
# src/main/java/techreborn/tiles/generator/advanced/TileSemiFluidGenerator.java
# src/main/java/techreborn/tiles/generator/advanced/TileThermalGenerator.java
# src/main/java/techreborn/tiles/generator/basic/TileSolidFuelGenerator.java
# src/main/java/techreborn/tiles/machine/iron/TileIronAlloyFurnace.java
# src/main/java/techreborn/tiles/machine/multiblock/TileDistillationTower.java
# src/main/java/techreborn/tiles/machine/multiblock/TileFluidReplicator.java
# src/main/java/techreborn/tiles/machine/multiblock/TileImplosionCompressor.java
# src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialBlastFurnace.java
# src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialGrinder.java
# src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialSawmill.java
# src/main/java/techreborn/tiles/machine/multiblock/TileVacuumFreezer.java
# src/main/java/techreborn/tiles/machine/tier1/TileAlloySmelter.java
# src/main/java/techreborn/tiles/machine/tier1/TileAssemblingMachine.java
# src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.java
# src/main/java/techreborn/tiles/machine/tier1/TileChemicalReactor.java
# src/main/java/techreborn/tiles/machine/tier1/TileCompressor.java
# src/main/java/techreborn/tiles/machine/tier1/TileElectricFurnace.java
# src/main/java/techreborn/tiles/machine/tier1/TileExtractor.java
# src/main/java/techreborn/tiles/machine/tier1/TileGrinder.java
# src/main/java/techreborn/tiles/machine/tier1/TileIndustrialElectrolyzer.java
# src/main/java/techreborn/tiles/machine/tier1/TileRecycler.java
# src/main/java/techreborn/tiles/machine/tier1/TileRollingMachine.java
# src/main/java/techreborn/tiles/machine/tier1/TileScrapboxinator.java
# src/main/java/techreborn/tiles/storage/TileAdjustableSU.java
# src/main/java/techreborn/tiles/storage/TileEnergyStorage.java
# src/main/java/techreborn/tiles/storage/TileHighVoltageSU.java
# src/main/java/techreborn/tiles/storage/TileLowVoltageSU.java
# src/main/java/techreborn/tiles/storage/TileMediumVoltageSU.java
# src/main/java/techreborn/tiles/storage/idsu/TileInterdimensionalSU.java
# src/main/java/techreborn/tiles/storage/lesu/TileLapotronicSU.java
# src/main/java/techreborn/utils/StackWIPHandler.java
# src/main/java/techreborn/world/TechRebornRetroGen.java
# src/main/resources/assets/techreborn/textures/items/armor/lithium_batpack.png
|
2018-12-26 16:08:04 +00:00 |
|
modmuss50
|
7fe876fe73
|
Fix #1614
|
2018-10-07 21:53:46 +01:00 |
|
drcrazy
|
4612ab334c
|
Cleanup of model registration
|
2018-10-04 12:38:34 +03:00 |
|
drcrazy
|
a40635e75f
|
Renamed ModItems to TRItems. Sorted members inside it.
|
2018-09-03 17:46:21 +03:00 |
|
modmuss50
|
95b49e5e23
|
Move some stuff around in RC
|
2018-07-20 22:02:46 +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
|
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
|
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
|
7d7340111d
|
Added Distillation tower. Closes #884
|
2017-10-16 15:52:10 +03:00 |
|
modmuss50
|
b25742dde0
|
Auto format code
|
2017-06-12 14:23:32 +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
|
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 |
|
Prospector
|
1215c47fc2
|
The Great Refactor of 2017 - Extractor Recipes
|
2017-01-03 09:32:55 -08:00 |
|
Prospector
|
206b20ac9e
|
The Great Refactor of 2017: Electrolyzer Edition
|
2017-01-02 13:08:58 -08:00 |
|