Commit graph

830 commits

Author SHA1 Message Date
modmuss50
09662db11a Merge remote-tracking branch 'origin/1.14' into 1.14.4 2019-07-29 14:31:42 +01:00
modmuss50
27207cb498 Expand fluid ingredient to allow limiting to specific fluid holder types 2019-07-29 14:31:21 +01:00
drcrazy
c4a3e5ecf5 Failed attempt to make cell recipe in reactor 2019-07-29 11:25:44 +03:00
drcrazy
213c1b6faa Some chemical reactor recipes 2019-07-29 11:09:37 +03:00
drcrazy
3b63383012 More on REI 2019-07-29 02:16:43 +03:00
drcrazy
29aeb50d85 Translation for REI recipe categories 2019-07-28 23:39:01 +03:00
modmuss50
0da3168bbf Fluid ingredients + some other work around this area 2019-07-28 17:14:38 +01:00
drcrazy
4e1dfa0018 Translation for solar panels 2019-07-26 15:22:48 +03:00
drcrazy
f28462a9e6 Alloy smelter recipes 2019-07-26 14:08:03 +03:00
drcrazy
e4b0eff608 Blockstates and models for fluid blocks 2019-07-26 12:41:10 +03:00
drcrazy
cc91888c4a More alloys 2019-07-25 15:59:43 +03:00
modmuss50
52da17dfd5 Start on REI support, very basic right now, but it will help a lot when adding recipes. 2019-07-25 13:14:46 +01:00
drcrazy
0742abb840 Start of alloy smelter recipes 2019-07-24 16:33:17 +03:00
drcrazy
ba7372c940 Couple of blockstates for fluids 2019-07-24 15:43:57 +03:00
drcrazy
c0164302e9 Smelting recipes done. 2019-07-24 13:01:45 +03:00
modmuss50
8964c5aceb Basic Dynamic cell rendering 2019-07-24 01:37:05 +01:00
drcrazy
56503ad117 Start of melting recipes 2019-07-23 17:21:17 +03:00
drcrazy
eb6a8b9ceb Done with crafting table recipes. New items don't have them yet. 2019-07-23 17:04:55 +03:00
drcrazy
4ec41d0bdc Recipe for dust from small dusts 2019-07-23 14:59:45 +03:00
drcrazy
54ad3360fd Moar storage recipes 2019-07-23 01:50:01 +03:00
drcrazy
f1ddc86bdd Reorder crafting table recipes 2019-07-23 01:20:04 +03:00
drcrazy
3aa40608f7 Added storage block from ingots recipe + subfodlers 2019-07-22 18:24:03 +03:00
drcrazy
9ec95d7147 uu-matter got some buffs during move to json 2019-07-22 17:26:58 +03:00
modmuss50
dbc89adaf7 Tile -> BlockEntity + some more refactors 2019-07-22 12:45:13 +01: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
7e4d65ffa0 Tags for rubber stuff 2019-07-16 01:17:29 +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
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