Modmuss50
|
3444c05c40
|
IInventory > IItemHandler
Most things should work, but havent been tested
Slot config will not work just yet
|
2018-09-07 14:05:19 +01:00 |
|
drcrazy
|
8cac9a9315
|
Use static fuse in static way.
|
2018-09-07 13:31:38 +03:00 |
|
Modmuss50
|
67226de701
|
fix compile changes
|
2018-09-05 18:43:33 +01: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
|
b41783054e
|
Fixed translation keys and update TR discord link
|
2018-09-04 17:25:45 +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
|
33b9f697dc
|
Merged all ingredients into single class
|
2018-09-03 14:49:59 +03:00 |
|
drcrazy
|
f54353290b
|
Updated ru_ru lang. Should fix FTBTeam/FTB-Continuum#437
|
2018-08-28 14:32: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 |
|
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
|
45d6317d12
|
Changes plates registration
|
2018-08-23 14:05:22 +03:00 |
|
drcrazy
|
c86f3dc2f4
|
Changes after PR review
|
2018-08-23 13:36:56 +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 |
|
Modmuss50
|
35f82eb5d3
|
Update licenses
|
2018-08-12 16:36:16 +01:00 |
|
Modmuss50
|
4e352c0953
|
Add creative versions of the Quantum tank and chest, they provide unlimited amount of the specified item/fluid
|
2018-08-12 16:32:43 +01:00 |
|
Modmuss50
|
89beff99c7
|
Fluid config work
|
2018-08-11 15:23:57 +01:00 |
|
Modmuss50
|
39475f86dc
|
Initial fluid config work
|
2018-08-10 17:45:16 +01: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 |
|
modmuss50
|
7e49c30586
|
Add a transparent grey overlay over recipe output slot
|
2018-08-03 17:55:59 +01:00 |
|
modmuss50
|
bbef813fe5
|
thanks idea for importing the best imports, fixes build
|
2018-08-02 19:09:11 +01:00 |
|
modmuss50
|
ffb770f64f
|
Rework the auto crafter to not use the recipe book, will fix it being impossible to use in some mod packs like continuum for example.
|
2018-08-02 18:42:58 +01:00 |
|
drcrazy
|
b3002b6f57
|
Fixed warnings
|
2018-07-23 12:55:18 +03:00 |
|
modmuss50
|
095390b430
|
Fix cell model
|
2018-07-20 22:39:09 +01: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
|
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 |
|
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 |
|
drcrazy
|
60873481f3
|
Unused anymore.
|
2018-07-13 18:04:50 +03:00 |
|
drcrazy
|
ff9ceecc28
|
Removed unused imports )
|
2018-06-25 14:55:23 +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 |
|
drcrazy
|
96d78c11a8
|
Shift for more info on powerbar. Closes FTBTeam/FTB-Continuum#261
|
2018-06-25 12:26:07 +03:00 |
|
drcrazy
|
30302e241b
|
Fixed charging \ discharging items items. Closes #1547
|
2018-06-20 18:27:58 +03:00 |
|
modmuss50
|
0e857e8b70
|
Fix #1546
|
2018-06-16 16:37:17 +01:00 |
|
Prospector
|
6d3b415ddd
|
Unify creative tabs
|
2018-06-12 15:42:20 -07:00 |
|
drcrazy
|
baacc67a64
|
Fixed unused and override warnings.
|
2018-06-12 12:55:57 +03:00 |
|
modmuss50
|
dace0e56d0
|
Show required stacks when building fusion reactor
|
2018-06-10 11:36:21 +01:00 |
|
modmuss50
|
169fa646fb
|
Add slot config to iron furnace, fixes #1536
|
2018-06-08 18:46:50 +01:00 |
|
drcrazy
|
2fb4c4559e
|
Removed unused variable
|
2018-05-30 17:01:56 +03:00 |
|
drcrazy
|
f203bbbefd
|
Started work on capability for powered item
|
2018-05-23 00:27:35 +03:00 |
|
drcrazy
|
c4c5f2135c
|
Started work in switching powered items to capability
|
2018-05-23 00:27:33 +03:00 |
|