modmuss50
|
9b46e3237e
|
move to silk fluids
|
2019-07-23 21:30:57 +01:00 |
|
modmuss50
|
85554bcfe2
|
Some more fixes to fluids
|
2019-07-23 21:09:10 +01:00 |
|
modmuss50
|
83bf6add1e
|
Large amount of fluid work
|
2019-07-23 20:46:07 +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
|
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
|
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 |
|
modmuss50
|
d6e64364fc
|
Power fixes
|
2019-07-10 22:34:55 +01: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
|
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
|
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
|
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
|
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
|
138c5e6072
|
De-dupe for re-battery. Some work on #1665
|
2019-04-23 20:57:56 +03:00 |
|
drcrazy
|
a506f4b301
|
Updated rubber log usage. Some work on #1706
|
2019-04-23 16:14:54 +03:00 |
|
modmuss50
|
1dad4697ba
|
Start moving everything over to the new system
|
2019-04-14 17:01:38 +01:00 |
|
modmuss50
|
98dd01697c
|
Basic test of a grinder recipe
|
2019-04-14 16:17:26 +01:00 |
|
drcrazy
|
c57c8b5287
|
Filter compressor and extractor recipes from JEI if IC2 dedupe is true
|
2019-04-12 12:45:34 +03:00 |
|
drcrazy
|
cd48daa152
|
Tier3 machine models done.
|
2019-04-09 15:04:05 +03:00 |
|
drcrazy
|
4df9d62a90
|
More models
|
2019-04-04 17:29:03 +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
|
d2db53f6f2
|
More rubber stuff
|
2019-03-13 14:57:49 +03:00 |
|
modmuss50
|
ac173a5a75
|
Add scrap box to matter fab, fixes https://github.com/TechReborn/TechReborn/issues/1682
|
2019-03-08 13:34:55 +00:00 |
|
drcrazy
|
f94d6630fb
|
More scrapbox recipes and less spam
|
2019-03-02 03:36:04 +03:00 |
|
drcrazy
|
97b517580a
|
Fixed license
|
2019-03-01 18:59:11 +03:00 |
|
drcrazy
|
f6579f5c2c
|
Rubber Plank stairs got textures
|
2019-03-01 17:29:19 +03:00 |
|