modmuss50
|
a984263b04
|
inital 19w46a port
|
2019-11-14 18:37:42 +00:00 |
|
modmuss50
|
8c9c736da9
|
19w37a
|
2019-09-12 16:55:41 +01:00 |
|
drcrazy
|
1f9bfabf21
|
Removed unused imports
|
2019-08-12 22:04:24 +03:00 |
|
modmuss50
|
77eee6f5b4
|
Move configs to one class
|
2019-08-12 17:57:00 +01:00 |
|
modmuss50
|
e0fb6042d8
|
Fix server crash #betaBuild
|
2019-08-08 14:27:21 +01:00 |
|
modmuss50
|
a08ee3d17a
|
Fix manual crashing the game, closes #1754
|
2019-08-08 11:49:11 +01:00 |
|
modmuss50
|
f8f20ce6ba
|
1.14.2
|
2019-06-13 13:14:11 +01:00 |
|
modmuss50
|
4e03ac893c
|
1147 - Initial auto mappings pass
|
2019-05-26 12:37:59 +01:00 |
|
modmuss50
|
6ab23c4c64
|
Merge remote-tracking branch 'remotes/origin/1.12' into 1.13
# Conflicts:
# build.gradle
# src/main/java/techreborn/Core.java
# src/main/java/techreborn/api/fluidreplicator/FluidReplicatorRecipe.java
# src/main/java/techreborn/api/recipe/recipes/BlastFurnaceRecipe.java
# src/main/java/techreborn/blocks/BlockMachineCasing.java
# src/main/java/techreborn/blocks/cable/EnumCableType.java
# src/main/java/techreborn/blocks/generator/solarpanel/BlockSolarPanel.java
# src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java
# src/main/java/techreborn/blocks/transformers/BlockTransformer.java
# src/main/java/techreborn/client/gui/GuiAESU.java
# src/main/java/techreborn/client/gui/GuiManual.java
# src/main/java/techreborn/client/gui/GuiVacuumFreezer.java
# src/main/java/techreborn/command/TechRebornDevCommand.java
# src/main/java/techreborn/compat/jei/RecipeUtil.java
# src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java
# src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeWrapper.java
# src/main/java/techreborn/config/ConfigTechReborn.java
# src/main/java/techreborn/init/IC2Duplicates.java
# src/main/java/techreborn/init/ModRecipes.java
# src/main/java/techreborn/init/OreDict.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/IndustrialGrinderRecipes.java
# src/main/java/techreborn/init/recipes/SmeltingRecipes.java
# src/main/java/techreborn/items/ItemUpgrades.java
# src/main/java/techreborn/items/ingredients/ItemParts.java
# src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java
# src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java
# src/main/java/techreborn/items/tools/ItemWrench.java
# src/main/java/techreborn/tiles/TileAlarm.java
# src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java
# src/main/java/techreborn/tiles/generator/TileCreativeSolarPanel.java
# src/main/java/techreborn/tiles/generator/TileLightningRod.java
# src/main/java/techreborn/tiles/machine/iron/TileIronAlloyFurnace.java
# src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialBlastFurnace.java
# src/main/java/techreborn/tiles/machine/multiblock/TileVacuumFreezer.java
# src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.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/tier3/TileMatterFabricator.java
# src/main/java/techreborn/tiles/storage/TileAdjustableSU.java
# src/main/java/techreborn/world/TechRebornRetroGen.java
# src/main/resources/assets/techreborn/blockstates/items/materials/part.json
# src/main/resources/assets/techreborn/blockstates/items/misc/upgrades.json
|
2019-04-27 20:32:56 +01:00 |
|
modmuss50
|
d7c4f55e6c
|
Auto format imports
|
2019-02-23 19:14:30 +00:00 |
|
modmuss50
|
7a441cea77
|
Taking a break now, 63
|
2019-02-22 15:11:38 +00:00 |
|
drcrazy
|
e3be87d517
|
MOre fixes for items. Down to 860
|
2019-02-22 01:13:30 +03:00 |
|
drcrazy
|
be23d2af6e
|
Cleanup after refactoring
|
2018-09-17 13:16:49 +03:00 |
|
ProfessorProspector
|
e5736669ca
|
Refactoring & cleaning
|
2018-09-16 13:48:51 -07:00 |
|