Commit graph

359 commits

Author SHA1 Message Date
modmuss50
26c208e811
Added license info to the header of all files. 2017-02-23 12:29:43 +00:00
modmuss50
e93c580528
Fix Minetweaker issue. 2017-01-16 10:06:11 +00:00
ProfessorProspector
38525a5bb0 Multiblock work, and industrial grinder gui 2017-01-14 11:06:34 -08:00
modmuss50
8b24fdf765
Merge remote-tracking branch 'remotes/origin/feature/containers-builder' into 1.11.2
# Conflicts:
#	src/main/java/techreborn/client/container/ContainerAlloyFurnace.java
#	src/main/java/techreborn/tiles/TileAlloyFurnace.java
2017-01-10 19:34:17 +00:00
ProfessorProspector
af91263621 Chemical reactor GUI & a couple recipe fixes 2017-01-09 16:54:48 -08:00
ProfessorProspector
dc160bbd67 started with one thing...then I ended up doing a lot of shit. 2017-01-08 23:03:36 -08:00
ProfessorProspector
0c4895efa4 Electric Furnace gui! 2017-01-08 14:46:13 -08:00
ProfessorProspector
eea9b83a9c Generator gui! 2017-01-08 14:07:34 -08:00
modmuss50
6aa8fde64a
Update to support updated recipe format in reborn core. 2017-01-08 21:43:15 +00:00
ProfessorProspector
2a78196939 Revamp centrifuge jei support 2017-01-08 12:29:14 -08:00
Ourten
b93fe6c5ad Convert FusionReactor 2017-01-08 16:32:03 +01:00
Ourten
bd16289c60 Convert IndustrialElectrolyzer, IndustrialGrinder and IndustrialSawmill 2017-01-08 16:20:13 +01:00
Ourten
b5881e2102 Convert VacuumFreezer and ImplosionCompressor 2017-01-08 16:01:24 +01:00
Ourten
ad890079ec Convert RollingMachine 2017-01-08 14:00:19 +01:00
Ourten
8a0a133e02 Convert AlloyFurnace and AlloySmelter 2017-01-08 13:10:13 +01:00
ProfessorProspector
3c40e25b6a Centrifuge stuff 2017-01-08 03:18:28 -08:00
ProfessorProspector
0cccb0a91b Merge branch 'feature/containers-builder' of https://github.com/TechReborn/TechReborn into feature/containers-builder
# Conflicts:
#	src/main/java/techreborn/client/gui/GuiBatbox.java
#	src/main/java/techreborn/client/gui/GuiQuantumChest.java
2017-01-07 20:22:34 -08:00
ProfessorProspector
d385e6eaf4 Batbox gui overhaul 2017-01-07 20:09:46 -08:00
Ourten
d77ed99e8a Convert AssemblingMachine 2017-01-08 02:31:37 +01:00
Ourten
35329cdc4a Convert ChemicalReactor 2017-01-08 02:23:03 +01:00
Ourten
60c88884a7 Convert Centrifuge 2017-01-08 02:19:26 +01:00
Ourten
94a0616d8e Add JEI transfer support for ContainerBuilder + Convert Compressor, Extractor and Grinder 2017-01-08 02:04:02 +01:00
ProfessorProspector
2ad33bd6a9 The Great Refactor of 2017 - Remove old Plate Cutting Machine stuff, move UU matter and cable recipes over, fix industrial grinder eu usage, clean up EnumStandaloneCableType, move Fluid Generator, Rolling Machine, Scrapbox, and Smelting recipes over. Add some alternative rolling recipes for metal recipes that are more efficient. 2017-01-04 14:19:41 -08:00
Prospector
6a70424252 Continue the "Great refactor of 2017". Massive variable name refactoring and start splitting crafting table recipes to their own class. 2016-12-31 23:29:32 -08:00
modmuss50
0922e0b886
Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/init/IC2Dict.java
#	src/main/java/techreborn/init/ModRecipes.java
#	src/main/java/techreborn/init/OreDict.java
2016-12-26 23:49:42 +00:00
al132
8306ebc72c Fix display slots in Fusion Reactor JEI 2016-12-22 11:29:07 -06:00
modmuss50
936ee13686
Remove last duplicated items. 2016-12-21 17:44:44 +00:00
modmuss50
5ff09a7eda
Some more work on deduplicating ic2 items/blocks 2016-12-21 17:31:52 +00:00
modmuss50
bfcc3a2117
Initial work on IC2 de-duplication 2016-12-18 21:36:29 +00:00
Ourten
baebc948d9 Add JEI integration for fluid generators recipes 2016-12-18 04:02:51 +01:00
Ourten
abcef5aace Add fluidstack info to jei recipe for IndustrialGrinder 2016-12-14 02:08:22 +01:00
ProfessorProspector
61de7101c3 TOP support now changes colours based on energy system config 2016-12-10 17:15:30 -08:00
modmuss50
c04a98061a Hide Missing recipe item in JEI 2016-12-05 12:50:55 +00:00
modmuss50
72f85d5243 Auto format code. 2016-12-05 10:48:21 +00:00
modmuss50
2fdce5405b Improve block names 2016-12-05 09:40:55 +00:00
modmuss50
c72c3b5851 Update JEI support, in a few places I could not figure it out, so there may be some issues. 2016-11-28 15:28:32 +00:00
modmuss50
e16c3eba02 Auto format 2016-11-25 13:25:51 +00:00
modmuss50
65e651f402
It compiles, disable JEI as it needs redoing 2016-11-19 14:41:00 +00:00
modmuss50
a0e6a2dc34
Start on the update 2016-11-19 12:50:08 +00:00
modmuss50
603c12590d
Update to support RC 2.8 2016-11-04 20:03:05 +00:00
modmuss50
fdb506ad15
Remove some config settings that break things, fixes #732 2016-10-08 21:56:24 +01:00
modmuss50
796df6c055
Auto Format code 2016-10-08 20:46:16 +01:00
modmuss50
7b162009c2 Hide Quantum chest and tanks when quantumstorage is loaded 2016-09-27 17:50:34 +01:00
way2muchnoise
fb6feac92f update to JEI 3.11 (#757) 2016-09-27 17:03:57 +01:00
modmuss50
edf266588f Fix wrench recipe issues
Remove fluid pipe
Add recipe to switch rubber
Fix some missing textures
2016-09-16 22:56:21 +01:00
modmuss50
0a2e878b88 Fix #738 2016-09-07 08:21:42 +01:00
modmuss50
d5ff2a42bb Fixes #723 and wrench works with ic2 machines now 2016-09-06 22:16:21 +01:00
modmuss50
22fd152ec9 Revert "Energy storages item charging fixes, transformers fixes, electric items fixes."
This reverts commit be4f10b975.

# Conflicts:
#	src/main/java/techreborn/init/ModBlocks.java
2016-08-10 00:29:47 +01:00
Dragon2488
be4f10b975 Energy storages item charging fixes, transformers fixes, electric items fixes. 2016-07-25 15:10:55 +07:00
Dragon2488
b42b5274b5 Multiblock fixes (compressor, freezer, grinder), grinder recipes fixes, freezer JEI recipe show fix. 2016-07-25 02:26:15 +07:00