modmuss50
|
4e03ac893c
|
1147 - Initial auto mappings pass
|
2019-05-26 12:37:59 +01:00 |
|
drcrazy
|
dd6a06409e
|
Bronze armor and tools
|
2019-03-17 23:47:21 +03:00 |
|
modmuss50
|
fd0fa8c66e
|
Bunch of item work, 96
|
2019-02-22 15:02:41 +00:00 |
|
modmuss50
|
18b3535607
|
More fixes 637
|
2019-02-21 23:07:44 +00:00 |
|
modmuss50
|
7df4742784
|
Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep
# Conflicts:
# src/main/java/techreborn/blocks/BlockRubberLog.java
# src/main/java/techreborn/client/gui/GuiAlloySmelter.java
# src/main/java/techreborn/client/gui/GuiAssemblingMachine.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/GuiElectricFurnace.java
# src/main/java/techreborn/client/gui/GuiExtractor.java
# src/main/java/techreborn/client/gui/GuiGasTurbine.java
# src/main/java/techreborn/client/gui/GuiGrinder.java
# src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java
# src/main/java/techreborn/client/gui/GuiIronFurnace.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/compat/jei/alloySmelter/AlloySmelterRecipeWrapper.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/grinder/GrinderRecipeWrapper.java
# src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeWrapper.java
# src/main/java/techreborn/events/StackToolTipEvent.java
# src/main/java/techreborn/items/armor/ItemCloakingDevice.java
# src/main/java/techreborn/items/armor/ItemLapotronicOrbpack.java
# src/main/java/techreborn/items/armor/ItemLithiumIonBatpack.java
# src/main/java/techreborn/items/battery/ItemBattery.java
# src/main/java/techreborn/items/battery/ItemEnergyCrystal.java
# src/main/java/techreborn/items/battery/ItemLapotronCrystal.java
# src/main/java/techreborn/items/battery/ItemLapotronicOrb.java
# src/main/java/techreborn/items/battery/ItemLithiumIonBattery.java
# src/main/java/techreborn/items/battery/ItemRedCellBattery.java
# src/main/java/techreborn/items/tool/ItemChainsaw.java
# src/main/java/techreborn/items/tool/ItemDrill.java
# src/main/java/techreborn/items/tool/ItemJackhammer.java
# src/main/java/techreborn/items/tool/advanced/ItemAdvancedChainsaw.java
# src/main/java/techreborn/items/tool/advanced/ItemAdvancedDrill.java
# src/main/java/techreborn/items/tool/advanced/ItemAdvancedJackhammer.java
# src/main/java/techreborn/items/tool/advanced/ItemRockCutter.java
# src/main/java/techreborn/items/tool/basic/ItemBasicChainsaw.java
# src/main/java/techreborn/items/tool/basic/ItemBasicDrill.java
# src/main/java/techreborn/items/tool/basic/ItemBasicJackhammer.java
# src/main/java/techreborn/items/tool/basic/ItemElectricTreetap.java
# src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java
# src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java
# src/main/java/techreborn/items/tool/industrial/ItemIndustrialJackhammer.java
# src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java
# src/main/java/techreborn/items/tool/industrial/ItemOmniTool.java
# src/main/java/techreborn/tiles/TileChargeOMat.java
# src/main/java/techreborn/tiles/storage/TileEnergyStorage.java
|
2019-01-07 22:58:42 +00:00 |
|
ProfessorProspector
|
0b963dcda9
|
Continue to make sense of things... this mod's a mess lol
|
2018-09-16 20:31:01 -07:00 |
|