Commit graph

843 commits

Author SHA1 Message Date
modmuss50
e26d1edc52 Configs 2019-07-10 21:56:22 +01:00
modmuss50
18950e0b29 1.14.3 + more recipe fixes 2019-07-01 00:24:12 +01:00
modmuss50
07a5c322e3 it runs 2019-06-12 19:57:23 +01:00
drcrazy
48198dbcb3 Models for lamps 2019-05-02 11:31:07 +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
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
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
drcrazy
a9acc91eff Models for generators done 2019-04-22 18:58:02 +03:00
drcrazy
a1fc56042a Models for generators 2019-04-22 17:38:17 +03:00
modmuss50
9f39da44b1 things craft 2019-04-15 21:54:55 +01:00
modmuss50
98dd01697c Basic test of a grinder recipe 2019-04-14 16:17:26 +01:00
drcrazy
f906aaa3cd Fix sap side 2019-04-09 17:04:51 +03:00
drcrazy
2a180cb5c2 Commented out tank update() 2019-04-09 16:34:54 +03:00
drcrazy
cd48daa152 Tier3 machine models done. 2019-04-09 15:04:05 +03:00
drcrazy
04f4e51695 Models for tier2 machines done. 2019-04-09 12:45:29 +03:00
drcrazy
76c2c03a13 More models for tier2 machines 2019-04-08 16:59:06 +03:00
drcrazy
3892b15685 More models for tier2 machines 2019-04-05 16:19:39 +03:00
drcrazy
6fecbb9392 Solar panels got models 2019-04-05 13:19:01 +03:00
drcrazy
4df9d62a90 More models 2019-04-04 17:29:03 +03:00
drcrazy
080e305efe Models for iron machines 2019-03-29 17:03:10 +03:00
drcrazy
c45e7fb836 Tier1 machines got models 2019-03-29 14:41:08 +03:00
drcrazy
5a910c94af Model for alloy smelter 2019-03-28 18:09:48 +03:00
drcrazy
84a380f51e Frames&Casings 2019-03-27 14:49:09 +03:00
drcrazy
0feec0612c Done with models for items. Except cell ( 2019-03-27 03:49:30 +03:00
drcrazy
f9c484090f Model for lithium batpack 2019-03-26 22:22:24 +03:00
drcrazy
79af5c0a15 Models for batteries 2019-03-26 21:07:34 +03:00
drcrazy
d3c6d43fee Tags for rubber stuff 2019-03-26 18:10:18 +03:00
drcrazy
5353b9c773 Upgrades got models 2019-03-26 15:29:38 +03:00
drcrazy
38e52f4a0f Migrated to vanilla approach 2019-03-25 12:45:20 +03:00
drcrazy
a3b41b9f3f More gem armour and tools 2019-03-25 12:43:50 +03:00
modmuss50
1d78c60e51 Superconductor update, adds cables, and new upgrades. 2019-03-23 18:03:41 +00:00
drcrazy
dd6a06409e Bronze armor and tools 2019-03-17 23:47:21 +03:00
drcrazy
f4ef5cc2d4 More models for items 2019-03-17 21:48:24 +03:00
drcrazy
bfd6f16504 Rubber log works. Need to doublecheck sap side 2019-03-15 15:14:19 +03:00
drcrazy
3cde5c8244 Facelift for debug tool 2019-03-15 14:14:21 +03:00
drcrazy
d2db53f6f2 More rubber stuff 2019-03-13 14:57:49 +03:00
drcrazy
9079765bc9 Easy part of textures for materials done 2019-03-13 13:53:31 +03:00
drcrazy
8b9f877d20 More materials got textures 2019-03-13 12:58:22 +03:00
drcrazy
92530b08b1 Ingots got textures 2019-03-12 14:41:17 +03:00
drcrazy
c58bf04667 Cleanup of migrated blocks\items 2019-03-11 17:15:02 +03:00
drcrazy
0db5a756b5 Parts got textures 2019-03-11 17:08:15 +03:00
drcrazy
3667f56bd8 Couple of items got their textures back including itemGroup 2019-03-11 13:42:51 +03:00
drcrazy
d29eb5706d Storage blocks got their textures 2019-03-05 17:27:28 +03:00
drcrazy
a4d9401040 At least block models could be in subfolders 2019-03-04 18:14:41 +03:00
drcrazy
d6d0515a1b Blockstate+models for ores 2019-03-04 17:37:01 +03:00
modmuss50
38eca7b3e8 Fix lang 2019-03-02 18:57:58 +00:00
drcrazy
f6579f5c2c Rubber Plank stairs got textures 2019-03-01 17:29:19 +03:00