Commit graph

2691 commits

Author SHA1 Message Date
Ourten
4e6b60e8e7 Fix tier1 machines hopper integration 2017-01-09 00:49:57 +01:00
Ourten
ac322f3e65 Fix recycler, Closes #887 2017-01-09 00:27:53 +01:00
Ourten
25e683b2e9 Fix some tiles update on clientside 2017-01-08 23:49:56 +01:00
ProfessorProspector
0c4895efa4 Electric Furnace gui! 2017-01-08 14:46:13 -08:00
ProfessorProspector
8b56947c28 Charge bench GUI 2017-01-08 14:27:45 -08:00
ProfessorProspector
eea9b83a9c Generator gui! 2017-01-08 14:07:34 -08:00
modmuss50
2ec7340383
Added better checks to ore dict, Closes #894 2017-01-08 21:58:32 +00:00
modmuss50
6aa8fde64a
Update to support updated recipe format in reborn core. 2017-01-08 21:43:15 +00:00
Ourten
cd33860403 Remove comment 2017-01-08 22:34:04 +01:00
Ourten
a700d80e0f Fix icon of SpriteSlot 2017-01-08 22:33:50 +01:00
ProfessorProspector
2a78196939 Revamp centrifuge jei support 2017-01-08 12:29:14 -08:00
Ourten
eb220643fc Change all containers init to IContainerProvider + Add Enum for gui ids handling 2017-01-08 20:34:46 +01: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
ea98e4a8a0 Convert BlastFurnace 2017-01-08 15:45:05 +01:00
Ourten
665b5f7569 Convert MatterFabricator 2017-01-08 15:22:59 +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
Ourten
619ddb14b8 Convert Scrapboxinator 2017-01-08 12:28:16 +01:00
ProfessorProspector
3c40e25b6a Centrifuge stuff 2017-01-08 03:18:28 -08:00
ProfessorProspector
0a9a62c455 Only clear if id 0 2017-01-08 01:37:44 -08:00
ProfessorProspector
a785d2a514 Make things better 2017-01-08 01:27:18 -08:00
ProfessorProspector
32c86b535b Merge branch '1.11.2' of https://github.com/TechReborn/TechReborn into feature/containers-builder 2017-01-07 20:59:41 -08:00
ProfessorProspector
9cbe6008c4 Fix batbox player slot positions 2017-01-07 20:25:26 -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
b9444b5ce5 Convert recycler + Fix slot indexes 2017-01-08 02:41:50 +01: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
Ourten
1df2c84e16 Convert ElectricFurnace 2017-01-07 22:11:54 +01:00
Ourten
af524f169f Convert IronFurnace 2017-01-07 21:56:23 +01:00
Ourten
0325383d21 Convert Fluid Generators 2017-01-07 21:06:08 +01:00
Ourten
f771b7a78d Convert Generator + Add fuelSlot 2017-01-07 20:34:03 +01:00
Ourten
53a3869092 Convert MFSU and BatBox 2017-01-07 19:12:50 +01:00
Ourten
e7eaa40bde Add convenient energy sync method to builder + Convert MFE + Fix slots range again 2017-01-07 17:21:14 +01:00
Ourten
28c4932ef6 Fix shift slots range 2017-01-07 16:16:00 +01:00
Ourten
89d3e8538b Cleanup some ContainerBuilder code 2017-01-07 15:59:59 +01:00
ProfessorProspector
d435d5d772 #releaseBuild 2017-01-07 00:30:01 -08:00
ProfessorProspector
49ae0045aa Fix a few recipes 2017-01-07 00:29:19 -08:00
ProfessorProspector
61688e1d62 Actually call mixed metal ingot recipes #releaseBuild Fixes #890 2017-01-07 00:05:08 -08:00
ProfessorProspector
0f172ddf52 some things 2017-01-07 00:02:57 -08:00
Ourten
9f74feabff Add container syncing helper + Rename slot builder methods
An example of the new syncing system can be found in the ChargeBench
2017-01-07 02:46:46 +01:00
Ourten
b688fe72e4 Fix shift-click deleting pre-existing stack 2017-01-06 22:57:40 +01:00
Ourten
728e956d69 Fix merge-shifting bypass of slot filters 2017-01-06 22:39:06 +01:00
ProfessorProspector
6acded92ed The return of Mr. Gui Builder 2017-01-05 21:01:28 -08:00
Ourten
19cdb5b4eb Fix shift-click bypass of slot filters + Remade ChargeBench and ChunkLoader with ContainerBuilder 2017-01-06 02:30:51 +01:00
Ourten
b70d9b41c6 Begin the ContainerBuilder system
Right now it doesn't do much and the internal code is quite ugly.
2017-01-06 00:43:34 +01:00