Commit graph

611 commits

Author SHA1 Message Date
modmuss50
1de4c4ff2b
Remove upgrade slots from Energy Storage blocks 2017-06-13 19:46:47 +01:00
modmuss50
c51b74fd68
Small fixes to the IDSU 2017-06-13 19:43:27 +01:00
modmuss50
70a2755796
Fix IDSU saving 2017-06-13 17:22:29 +01:00
modmuss50
44817f1a03
Use WorldStorage, but it still doesn't save :/ 2017-06-13 16:11:41 +01:00
modmuss50
f90bb45351
Move idsu manger to use capability's 2017-06-13 16:02:49 +01:00
modmuss50
14e30481e5
Improve IDSU 2017-06-13 13:14:02 +01:00
modmuss50
c4868a3264
Changes to the LightningRod 2017-06-13 13:03:32 +01:00
modmuss50
3829e83459
Fixes #1131 2017-06-13 12:48:31 +01:00
modmuss50
df62000513
Found some more null itemstacks 2017-06-13 11:26:08 +01:00
modmuss50
c3c0a0421d
Lower generator output 2017-06-12 21:02:22 +01:00
modmuss50
b7e141e004
More config changes 2017-06-12 20:33:30 +01:00
modmuss50
0cf3e43992
Update to support RC changes 2017-06-12 20:06:15 +01:00
modmuss50
cf5ed6afa0
Remove stupid/unused configs 2017-06-12 14:39:06 +01:00
modmuss50
b25742dde0
Auto format code 2017-06-12 14:23:32 +01:00
modmuss50
624d8fb93a
Remove old cables 2017-06-12 10:55:26 +01:00
modmuss50
41c94b2a52
Fix CreativeSolar panel smoking when pushing power. 2017-06-12 09:52:43 +01:00
Prospector
81f701477c Fix compile 2017-06-09 08:47:44 -07:00
Prospector
2d5d60be6b Do more configs. Still a lot to go 2017-06-09 08:31:19 -07:00
modmuss50
c7419ee8ac
Update to support new RC teir calculations 2017-06-09 14:53:24 +01:00
Prospector
2b7868c651 More configs & start fixing cable models 2017-06-08 19:12:58 -07:00
Prospector
ad36dfcddb Started redoing config 2017-06-08 11:45:30 -07:00
modmuss50
968cb057e1
Fix matter fab not using all output slots, closes #1101 2017-06-02 20:36:02 +01:00
modmuss50
dd7005dc0a
Disable upgrade slots in electric furnace for now, closes #1064 2017-06-02 20:32:55 +01:00
modmuss50
f9d4134365
Start redoing Matter Fabricator gui
(cherry picked from commit 5c6bc6c)
2017-06-02 20:32:03 +01:00
ProfessorProspector
82927ae405
Start redoing Matter Fabricator gui
(cherry picked from commit 5c6bc6c)
2017-06-02 20:23:07 +01:00
modmuss50
2dffd85ccc
Fix compile errors with merge 2017-06-02 20:20:56 +01:00
modmuss50
e7813a4bed
Fix matterfab only using its first slot, closes #1076
(cherry picked from commit 694d1d4)
2017-06-02 20:14:18 +01:00
modmuss50
4e47e2102e
Fix LESU, closes #999 closes #938 closes #761 2017-06-02 20:10:00 +01:00
modmuss50
2c16bf58b7
Update license header 2017-06-02 19:35:51 +01:00
modmuss50
b4c873f54c
Fixes IDSU not setting the players udid when placed. 2017-06-02 16:16:34 +01:00
modmuss50
b8a2d2d266
Commit uncommitted power net code 2017-05-25 20:35:36 +01:00
modmuss50
d474870977
Initial work on standalone cables. 2017-05-19 13:12:02 +01:00
drcrazy
74f798e9c3 Rolling machine fixes (#1075)
* Fix for issue #942
2017-05-02 18:38:16 +01:00
modmuss50
3d55b435d4
Ic2 1.11.2 support 2017-04-21 09:09:28 +01:00
Dimmerworld
723fc1a551 Fix matter fabricator uses scrapboxs when full (#1052)
* Fix matter fabricator using scrapboxes when full
2017-04-14 09:56:11 -07:00
modmuss50
1c1f540a26
Drop upgrades when machine is broken, shift right-click to add into machine. 2017-04-12 18:31:26 +01:00
modmuss50
d9af8309b1
Finished the gui, and start work on adding support for the furnace. 2017-04-12 18:04:10 +01:00
modmuss50
1ccd192790
Update to work with major RC changes. 2017-04-11 19:12:32 +01:00
modmuss50
4f05367f52
Got the upgrades working, just need the textures. 2017-04-11 13:21:23 +01:00
modmuss50
0e41a97f7e Looks like I missed a place where it was being used. 2017-04-11 00:17:52 +01:00
modmuss50
34978f7ffe Remove old upgrade handler to make way for the new one. 2017-04-11 00:12:36 +01:00
modmuss50
21dd44def6
Increase iron furnace speed 2017-04-08 15:08:58 +01:00
modmuss50
bcfb330632
Fixes #1036 2017-04-08 15:03:46 +01:00
drcrazy
291eadfeed More work for Sawmill 2017-04-07 18:22:37 +03:00
modmuss50
10bbdbc4d7
Fixes thermal generator crash, closes #972
(cherry picked from commit bb582fd)
2017-03-16 15:54:48 +00:00
modmuss50
056eff09b2
Some more improvements to the power net. 2017-03-16 13:22:17 +00:00
modmuss50
5231e1d93b
Fix Industrial Grinder getting stuck at 100%, closes #1004 2017-03-15 09:59:23 +00:00
modmuss50
92acc51aaf
Added a creative panel, it provides infinite power and has no recipe.
(cherry picked from commit 456ee3c)
2017-03-15 09:48:25 +00:00
modmuss50
fe9d1defdc
Fix null issue with last cherry pick 2017-03-13 11:04:10 +00:00
modmuss50
bbf93c3ae3
Rewrite some of the logic behind the matter fabricator, now works with ic2 scrap as well.
Closes #1002 and Closes #822

(cherry picked from commit 93ccd8b)
2017-03-13 11:03:44 +00:00
modmuss50
d126edaa1b
Fixes #981 2017-02-23 12:38:36 +00:00
modmuss50
26c208e811
Added license info to the header of all files. 2017-02-23 12:29:43 +00:00
Ourten
9847719a91 Fix automation for IndustrialGrinder and IndustrialElectrolyzer, closes #953 2017-02-03 16:57:34 +01:00
Ourten
08087871a1 Fix wrench drop of LightningRod, SolarPanel, WaterMill and WindMill 2017-02-02 22:28:48 +01:00
Ourten
eafc5c831d Fix Grinder not displaying energy info 2017-02-02 22:23:00 +01:00
Ourten
1b084569ac Fix recycler outputSlot 2017-01-27 01:46:16 +01:00
modmuss50
c058e2fbee
Fix #932 2017-01-24 21:28:54 +00:00
modmuss50
ed771a6e05
Fix rolling machine power storage value being large, closes #934 2017-01-24 21:11:27 +00:00
Ourten
fea2ce5f1f Improve FluidGenerators performance with recipes check 2017-01-19 01:12:32 +01:00
Ourten
64020b01e0 Fix AlloyFurnace ItemStack null reference, closes #901 2017-01-15 23:45:48 +01: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
99be70713b Recycler gui 2017-01-09 15:57:29 -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
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
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
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
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
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
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
f771b7a78d Convert Generator + Add fuelSlot 2017-01-07 20:34:03 +01:00
ProfessorProspector
0f172ddf52 some things 2017-01-07 00:02:57 -08:00
Ourten
11c67f68a9 Fix TechReborn chests inventory capabilities. close #878 2017-01-05 00:17:53 +01: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
Ourten
c8b3568a0c Unify TechReborn chests + Fix deep chests inventory drops 2016-12-18 22:06:07 +01:00
Ourten
da41ae7731 Apply QuantumChest fixes to DigitalChest 2016-12-18 21:34:01 +01:00
Ourten
1d27182cc2 Fix FluidGenerators activation and energy production 2016-12-17 17:18:49 +01:00
Ourten
003d124667 Allow FluidGenerators to refill items with their tank 2016-12-17 16:22:31 +01:00
Ourten
97192ee3f4 Add the unified FluidGenerator recipe system + Restructure FluidGenerators tiles
They should all be pretty now
2016-12-17 01:25:32 +01:00
Ourten
3bf346f39a Fix QuantumChest duplication bug and content sync 2016-12-16 21:44:32 +01:00
Ourten
f65999f960 Fix QuantumTank fluid updates 2016-12-16 15:11:46 +01:00
Ourten
1181ce49f2 Add tryAddingEnergy to ThermalGenerator to fix eternal activation with adjacent lava 2016-12-15 14:41:04 +01:00
Ourten
d727c2698b Add tryAddingEnergy method to SemifluidGenerator 2016-12-15 14:39:53 +01:00
Ourten
487fdeddcb Add activation state change for HeatGenerator + Cleanup side-check code 2016-12-15 14:39:27 +01:00
Ourten
a0e068cad4 Add tryAddingEnergy method to GasTurbine
This method will avoid blocking of the generator a little bit before it's max capacity
2016-12-15 14:36:48 +01:00