modmuss50
|
f6d5d88a4b
|
rename TileLegacyMachineBase to TileMachineBase
|
2018-09-17 07:31:41 +01:00 |
|
ProfessorProspector
|
0b963dcda9
|
Continue to make sense of things... this mod's a mess lol
|
2018-09-16 20:31:01 -07:00 |
|
ProfessorProspector
|
c568876caa
|
Revert ore dict comment & remove useless stuff
|
2018-09-16 14:01:00 -07:00 |
|
ProfessorProspector
|
e5736669ca
|
Refactoring & cleaning
|
2018-09-16 13:48:51 -07:00 |
|
drcrazy
|
1b3bf6f5c2
|
Cleaned up translation keys
|
2018-09-07 17:37:49 +03:00 |
|
drcrazy
|
645606c5c4
|
itemRubber already oredicted in proper class
|
2018-09-07 15:25:10 +03:00 |
|
drcrazy
|
6d3d1f2df2
|
Organized items. MOved creative tab setter to parent.
|
2018-09-07 14:51:41 +03:00 |
|
Modmuss50
|
6060a97855
|
Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep
# Conflicts:
# src/main/java/techreborn/api/fluidreplicator/FluidReplicatorRecipe.java
# src/main/java/techreborn/client/container/ContainerPda.java
# src/main/java/techreborn/client/gui/TRBuilder.java
# src/main/java/techreborn/compat/crafttweaker/CTFusionReactor.java
# src/main/java/techreborn/compat/crafttweaker/CTGeneric.java
# src/main/java/techreborn/compat/jei/RecipeUtil.java
# src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java
# src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeCategory.java
# src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeCategory.java
# src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeCategory.java
# src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeCategory.java
# src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeCategory.java
# src/main/java/techreborn/compat/jei/compressor/CompressorRecipeCategory.java
# src/main/java/techreborn/compat/jei/distillationTower/DistillationTowerRecipeCategory.java
# src/main/java/techreborn/compat/jei/extractor/ExtractorRecipeCategory.java
# src/main/java/techreborn/compat/jei/fluidReplicator/FluidReplicatorRecipeCategory.java
# src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeCategory.java
# src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/grinder/GrinderRecipeCategory.java
# src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeCategory.java
# src/main/java/techreborn/compat/jei/industrialElectrolyzer/IndustrialElectrolyzerRecipeCategory.java
# src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeCategory.java
# src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeCategory.java
# src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeCategory.java
# src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeCategory.java
# src/main/java/techreborn/init/ModBlocks.java
# src/main/java/techreborn/init/ModTileEntities.java
# src/main/java/techreborn/init/recipes/CraftingTableRecipes.java
# src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java
# src/main/java/techreborn/items/tools/ItemAdvancedDrill.java
# src/main/java/techreborn/packets/PacketAutoCraftingTableLock.java
# src/main/resources/assets/techreborn/lang/en_us.lang
# src/main/resources/assets/techreborn/loot_tables/chests/abandoned_mineshaft.json
# src/main/resources/assets/techreborn/loot_tables/chests/desert_pyramid.json
# src/main/resources/assets/techreborn/loot_tables/chests/igloo_chest.json
# src/main/resources/assets/techreborn/loot_tables/chests/jungle_temple.json
# src/main/resources/assets/techreborn/loot_tables/chests/simple_dungeon.json
# src/main/resources/assets/techreborn/loot_tables/chests/village_blacksmith.json
|
2018-09-05 17:49:49 +01:00 |
|
drcrazy
|
79ff8ee5b0
|
Cleaned up code dupes
|
2018-09-04 13:46:51 +03:00 |
|
drcrazy
|
a05ba25f31
|
Flattened upgrades
|
2018-09-04 13:26:09 +03:00 |
|
drcrazy
|
a40635e75f
|
Renamed ModItems to TRItems. Sorted members inside it.
|
2018-09-03 17:46:21 +03:00 |
|
drcrazy
|
0443ad4a3a
|
Destructopack is a separate item
|
2018-09-03 17:01:46 +03:00 |
|
drcrazy
|
33b9f697dc
|
Merged all ingredients into single class
|
2018-09-03 14:49:59 +03:00 |
|
drcrazy
|
db4dbdc956
|
UU-matter is now part of parts enum
|
2018-08-27 15:48:41 +03:00 |
|
drcrazy
|
8987311694
|
Flattened parts
|
2018-08-27 13:26:56 +03:00 |
|
Modmuss50
|
f251349189
|
Should fix #1587
|
2018-08-24 21:07:38 +01:00 |
|
YuRaNnNzZZ
|
2e461b5ef6
|
rock cutter no longer gets enchanted on recraft
|
2018-08-24 20:12:50 +03:00 |
|
drcrazy
|
de45f3e68d
|
SmallDusts flattened
|
2018-08-24 15:56:53 +03:00 |
|
drcrazy
|
edd4e0df3e
|
Flattened dusts.
|
2018-08-24 14:56:25 +03:00 |
|
drcrazy
|
1ee9ffb007
|
Flattened ingots.
|
2018-08-24 13:43:03 +03:00 |
|
drcrazy
|
aadc7150f3
|
Gems are flattened
|
2018-08-23 17:16:17 +03:00 |
|
drcrazy
|
2939ee02a3
|
Flattened nuggets
|
2018-08-23 15:20:57 +03:00 |
|
drcrazy
|
f45da44f2b
|
Plates are flattened and enumed
|
2018-08-23 00:14:02 +03:00 |
|
drcrazy
|
be024f0179
|
Updated forge
|
2018-08-22 15:55:14 +03:00 |
|
drcrazy
|
2e4c3ebf1a
|
Some flattening attempt for plates
|
2018-08-07 13:50:46 +03:00 |
|
modmuss50
|
53b450acea
|
Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep
# Conflicts:
# src/main/java/techreborn/compat/immersiveengineering/RecipeImmersiveEngineering.java
# src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java
# src/main/java/techreborn/init/ModRecipes.java
# src/main/java/techreborn/packets/PacketAutoCraftingTableLock.java
|
2018-08-03 18:04:40 +01:00 |
|
drcrazy
|
a6f242e7e6
|
Overriden setContainerToEmpty. I thought this was already in GH.
|
2018-07-30 11:48:39 +03:00 |
|
modmuss50
|
1f65363396
|
Merge remote-tracking branch 'origin/1.13-prep' into 1.13-prep
|
2018-07-24 14:18:22 +01:00 |
|
modmuss50
|
1be2752b72
|
Rename fluids
|
2018-07-24 14:18:09 +01:00 |
|
drcrazy
|
a42e04606f
|
Done with maxCharge and trasnferRate review for powered items
|
2018-07-23 14:21:07 +03:00 |
|
drcrazy
|
b3002b6f57
|
Fixed warnings
|
2018-07-23 12:55:18 +03:00 |
|
modmuss50
|
2910acc29c
|
Remove META_PLACEHOLDER
|
2018-07-20 22:36:38 +01:00 |
|
modmuss50
|
f5c6b59ebd
|
Mappings
|
2018-07-20 22:31:20 +01:00 |
|
modmuss50
|
389b716880
|
Fix build
|
2018-07-20 22:10:29 +01:00 |
|
modmuss50
|
7f8ce535a7
|
General code cleanup
|
2018-07-20 22:08:21 +01:00 |
|
modmuss50
|
95b49e5e23
|
Move some stuff around in RC
|
2018-07-20 22:02:46 +01:00 |
|
modmuss50
|
f78abb1a21
|
Remove some old stuff
|
2018-07-20 21:55:29 +01:00 |
|
drcrazy
|
7b630f576f
|
Polishing powered items
|
2018-07-20 17:23:21 +03:00 |
|
drcrazy
|
daf4b6fad6
|
Capacity changes for powered armor
|
2018-07-20 12:58:52 +03:00 |
|
drcrazy
|
b3590dbb37
|
Make it run but tons of useless copy-paste
|
2018-07-20 02:56:19 +03:00 |
|
drcrazy
|
523d0284b7
|
Updated powered items to match RC changes
|
2018-07-19 18:30:47 +03:00 |
|
modmuss50
|
b65e963f12
|
Move all mod compatibility out into its own mod, ic2 support is gone and will come back in some more basic form once ic2 is on 1.13
The new mod compatibility will be included (either shaded or jar-in-jar) in the main TR distrubtion, this has been done to aid development
|
2018-07-19 10:48:37 +01:00 |
|
YuRaNnNzZZ
|
ced370444f
|
adv/diamond electric tools charge rate buff (#1558) (Kudos to YuRaNnNzZZ)
|
2018-06-26 11:53:21 +03:00 |
|
modmuss50
|
d4a43d24a1
|
Fix incorrect usage of item stack checking
I have no idea how they worked without issue for this long :D
|
2018-06-25 12:34:13 +01:00 |
|
modmuss50
|
7124ee6a11
|
Remove range upgrade as it didnt do anything
|
2018-06-24 10:48:47 +01:00 |
|
drcrazy
|
30302e241b
|
Fixed charging \ discharging items items. Closes #1547
|
2018-06-20 18:27:58 +03:00 |
|
drcrazy
|
48d2227407
|
Made batteries charge configurable for non-basic batteries.
|
2018-06-19 14:01:10 +03:00 |
|
ProfessorProspector
|
1ebf67d933
|
Add Silk Touch to the rock cutter in the recipe and creative tab, so it's more obvious of what it does
|
2018-06-16 10:27:19 -07:00 |
|
ProfessorProspector
|
77ed9f7bba
|
Remove accidental refined diamond
|
2018-06-16 10:03:20 -07:00 |
|
Prospector
|
6d3b415ddd
|
Unify creative tabs
|
2018-06-12 15:42:20 -07:00 |
|