Commit graph

672 commits

Author SHA1 Message Date
drcrazy
7977a8e73b Few warnings and moar recipes 2019-07-18 01:32:37 +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
modmuss50
18950e0b29 1.14.3 + more recipe fixes 2019-07-01 00:24:12 +01:00
modmuss50
f8f20ce6ba 1.14.2 2019-06-13 13:14:11 +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
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
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
5c309c8b3d Updated forge to 1.13.2 - 25.0.191. Removed unused imports 2019-04-26 17:37:10 +03:00
drcrazy
f906aaa3cd Fix sap side 2019-04-09 17:04:51 +03:00
drcrazy
cd48daa152 Tier3 machine models done. 2019-04-09 15:04:05 +03:00
drcrazy
ec2fcf5d6d Removed unused import. 2019-04-03 18:24:27 +03:00
drcrazy
b713b43eaf Transformers\Energy storages will use vanilla rotation. Closes #1692 2019-04-03 18:23:28 +03:00
drcrazy
c122a480e5 Updated forge and mappings 2019-04-01 17:22:59 +03:00
modmuss50
17427e675e Fixes https://github.com/TechReborn/TechReborn/issues/1693 and Fixes https://github.com/FTBTeam/FTB-Sky-Odyssey/issues/102 2019-03-25 21:37:27 +00:00
modmuss50
1d78c60e51 Superconductor update, adds cables, and new upgrades. 2019-03-23 18:03:41 +00:00
drcrazy
1c86c6c031 Tree grow from sapling. Not correctly though ( 2019-03-17 21:39:07 +03:00
drcrazy
bfd6f16504 Rubber log works. Need to doublecheck sap side 2019-03-15 15:14:19 +03:00
drcrazy
889e576683 Started porting for Rubber Tree world gen feature 2019-03-13 18:13:49 +03:00
drcrazy
d2db53f6f2 More rubber stuff 2019-03-13 14:57:49 +03:00
drcrazy
96bbe75c60 Removed unused imports 2019-03-11 02:22:49 +03:00
drcrazy
682b8ccede Do not create already existing block property 2019-03-07 11:49:23 +03:00
drcrazy
f6579f5c2c Rubber Plank stairs got textures 2019-03-01 17:29:19 +03:00
drcrazy
927d3637a5 FIxed couple of warnings 2019-02-26 14:47:13 +03:00
modmuss50
5397b26cf2 Machine cases drop them selves to fix https://github.com/FTBTeam/FTB-Ultimate-Reloaded/issues/90 2019-02-25 17:25:06 +00:00
drcrazy
767ce10bf1 Revert wrong changes 2019-02-25 11:51:57 +03:00
drcrazy
3314ba33b5 Fixed warnings 2019-02-25 11:43:43 +03:00
modmuss50
db3a6f2c7e Enough to get the game running 2019-02-23 23:51:37 +00:00
modmuss50
d7c4f55e6c Auto format imports 2019-02-23 19:14:30 +00:00
modmuss50
fd0fa8c66e Bunch of item work, 96 2019-02-22 15:02:41 +00:00
drcrazy
ab2ce91e39 MOre rubber stuff. ONly sapling left to do 2019-02-22 17:25:31 +03:00
drcrazy
b6494ecbf6 Merge with HEAD 2019-02-22 17:19:38 +03:00
modmuss50
d68c65641d Gui fixes, 393 2019-02-22 14:02:04 +00:00
drcrazy
06632be822 One more block done. Just a few left 2019-02-22 16:14:46 +03:00
drcrazy
647b126c98 Updated mappings 2019-02-22 14:36:13 +03:00
drcrazy
63fe6d2ef4 Some luv to rubber stuff ) 2019-02-22 13:22:07 +03:00
modmuss50
6f9baaeb30 Crafting manager fixes 2019-02-22 09:47:07 +00:00
drcrazy
a003656419 GUI fixes 2019-02-22 11:51:55 +03:00
modmuss50
61b6d30262 Bunch of tile work 752 2019-02-21 22:46:26 +00:00
drcrazy
e513e20e5a Migrated batteries + TR Itemgroup 2019-02-22 00:22:43 +03:00
modmuss50
f6a79ce579 Some random fixes, 959 errors 2019-02-21 18:11:55 +00:00
modmuss50
a93361792f fix ConfigRegistry location, 1118 errors 2019-02-21 17:55:17 +00:00