Commit graph

4101 commits

Author SHA1 Message Date
modmuss50
50c13bafdc 1.14.4 2019-07-22 11:31:24 +01:00
drcrazy
d0dedc6893 Cleanup 2019-07-22 02:43:22 +03:00
drcrazy
1639fd63a3 Remove excessive modifiers 2019-07-22 01:27:30 +03:00
drcrazy
70d6c8f102 Of the final day 2019-07-19 11:57:18 +03:00
drcrazy
f890ac7146 And leave behind those who don't know 2019-07-19 01:12:48 +03:00
drcrazy
ed6cfa916b Above us all 2019-07-18 16:24:29 +03:00
drcrazy
7d05bfbe96 Machines we are sending to the skies 2019-07-18 16:24:11 +03:00
drcrazy
7977a8e73b Few warnings and moar recipes 2019-07-18 01:32:37 +03:00
drcrazy
9ac21ded30 Fix lang and parts 2019-07-18 00:49:07 +03:00
drcrazy
db9db5b77d More tool recipes 2019-07-17 17:17:15 +03:00
drcrazy
d9cbbfa0fc Gem armor and tools 2019-07-17 16:24:37 +03:00
drcrazy
9db0e068e1 Recipe for cables 2019-07-16 23:06:32 +03:00
drcrazy
8b37482494 Just a few recipes 2019-07-16 13:58:29 +03:00
drcrazy
3edff88ee0 Ores and Rubber trees are spawn on Overworld and Nether 2019-07-16 02:25:07 +03:00
drcrazy
7e4d65ffa0 Tags for rubber stuff 2019-07-16 01:17:29 +03:00
drcrazy
c2e871a31b They grow. But not sustain yet ( 2019-07-15 23:30:10 +03:00
drcrazy
d6788c8da5 Moved misc blocks to their own package. Start of rubber stuff 2019-07-15 17:24:31 +03:00
drcrazy
4f1593771e Fixed imports 2019-07-15 10:59:08 +03:00
drcrazy
5d93843a1e Formatting 2019-07-15 10:43:08 +03:00
drcrazy
57d0d6d3f0 Improvements for BlockCable 2019-07-15 02:44:27 +03:00
drcrazy
3e7596bbdb Fixed last texture error re forge bucket png is missing 2019-07-13 02:50:59 +03:00
drcrazy
ce72496ddd Models for cables 2019-07-12 17:22:22 +03:00
modmuss50
d6e64364fc Power fixes 2019-07-10 22:34:55 +01:00
modmuss50
e26d1edc52 Configs 2019-07-10 21:56:22 +01:00
modmuss50
a7fbc3017b more inv fixes 2019-07-04 12:16:17 +01:00
modmuss50
42637df12d Fix nuke 2019-07-01 00:48:20 +01:00
modmuss50
7dc6dddc51 Refactor out inv wrapper 2019-07-01 00:39:13 +01:00
modmuss50
18950e0b29 1.14.3 + more recipe fixes 2019-07-01 00:24:12 +01:00
modmuss50
5f134a7379 Fixes 2019-06-30 22:56:56 +01:00
modmuss50
f8f20ce6ba 1.14.2 2019-06-13 13:14:11 +01:00
modmuss50
4479116d1c Add a tooltip event to fix the tooltips 2019-06-12 22:27:09 +01:00
modmuss50
8d859bd77b fix some crashes 2019-06-12 20:01:44 +01:00
modmuss50
07a5c322e3 it runs 2019-06-12 19:57:23 +01:00
modmuss50
6b9f6cb4f8 it compiles :D 2019-06-12 19:29:04 +01:00
modmuss50
500ff29dbd 377 2019-06-04 12:13:15 +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
48198dbcb3 Models for lamps 2019-05-02 11:31:07 +03:00
drcrazy
2794c813eb Fix alarm shape 2019-05-01 00:40:14 +03:00
drcrazy
e01e9398ea Model for alarm 2019-04-30 16:48:43 +03:00
drcrazy
b9ae05afaa IDSU and LESU got models 2019-04-30 13:11:00 +03:00
drcrazy
6c8d9e9b74 Superconductor cable port from 1.12 to 1.13 2019-04-29 17:42:29 +03: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
drcrazy
77fa583360 More models for energy storages 2019-04-26 17:59:37 +03:00
drcrazy
5c309c8b3d Updated forge to 1.13.2 - 25.0.191. Removed unused imports 2019-04-26 17:37:10 +03:00
drcrazy
8cc611192d Lapotron Crystal dedupe for #1665 2019-04-25 16:40:36 +03:00
drcrazy
d30d3316e9 Energy Crystal dedupe for #1665 2019-04-25 16:07:06 +03:00
drcrazy
2afa32ad9e Models for some energy storages 2019-04-24 17:36:09 +03:00
drcrazy
86a2056903 Models for transformers. Optimus Prime FTW! 2019-04-24 17:19:15 +03:00