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
Ourten
8f0cc22472
Add activation state change to DragonEggSiphoner + Add convenient energy add method
2016-12-15 14:35:37 +01:00
Ourten
4c2a5b3f23
Add missing import in GasTurbine
2016-12-14 19:51:33 +01:00
Ourten
82ae50f5a8
Fix Semifluid generator activate state and fix fluid sync
2016-12-14 19:22:29 +01:00
Ourten
caf5d56e3c
Fix GasTurbine activate state and fix fluid amount sync
2016-12-14 18:36:43 +01:00
Ourten
65ec0db2de
Fix ThermalGenerator logic and packet updates
...
There is one bug left, the displayed liquid stack is always air.
2016-12-14 17:43:33 +01:00
modmuss50
c1d2e875bf
Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
...
# Conflicts:
# build.gradle
# src/main/java/techreborn/blocks/BlockRubberLog.java
# src/main/java/techreborn/init/ModRecipes.java
# src/main/java/techreborn/items/tools/ItemElectricTreetap.java
# src/main/java/techreborn/items/tools/ItemTreeTap.java
2016-12-14 09:23:24 +00:00
modmuss50
47df52a7f2
Improve power transfur between items, closes https://github.com/TechReborn/TechReborn/issues/835
2016-12-14 09:13:30 +00:00
ProfessorProspector
c271422e11
Remove deprecated empty cell
2016-12-12 15:57:04 -08:00
modmuss50
7a4c7cfea9
Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
2016-12-12 09:53:30 +00:00
modmuss50
71d8a3c7e8
Iron furnace now uses the same sides as the vanilla furnace, closes #622
2016-12-12 09:49:00 +00:00
modmuss50
5dff31d937
A bunch more null check \o/
2016-12-06 18:22:18 +00:00
modmuss50
97e5fcc032
Fix #825
2016-12-06 08:23:11 +00:00
modmuss50
75dbf2daff
Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
2016-12-05 10:59:22 +00:00
modmuss50
5782d2d032
Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
...
# Conflicts:
# src/main/java/techreborn/client/container/ContainerAlloySmelter.java
# src/main/java/techreborn/client/container/ContainerAssemblingMachine.java
# src/main/java/techreborn/client/container/ContainerCentrifuge.java
# src/main/java/techreborn/items/tools/ItemNanosaber.java
2016-12-05 10:57:55 +00:00
modmuss50
2fdce5405b
Improve block names
2016-12-05 09:40:55 +00:00
brad18
02011b247a
Fixes to the Centrifuge Block ( #815 )
...
* Fixes Compressor inputting items into output slot
* Changes to Centrifuge block
Add inventory import/export via conduits etc.
Added support for overclockers.
Only allow empty cans into the correct slot and put all other items into slot 0 (ingredient slot).
Credit to Ellpeck for helping with this one.
2016-11-28 21:32:13 +00:00
brad18
a5f306eb69
Fixes Compressor inputting items into output slot ( #812 )
2016-11-27 22:21:09 +00:00
modmuss50
b1b8537159
Fix log spam with some machines, closes #809 #releasebuild
2016-11-26 21:14:57 +00:00
modmuss50
e16c3eba02
Auto format
2016-11-25 13:25:51 +00:00
modmuss50
528fecc2b5
Fix a load of null issues, and get it to sort of work.
2016-11-19 16:36:13 +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
d9d8845d6d
Added flare, still needs some textures
2016-11-06 19:14:43 +00:00
modmuss50
b60941ddd4
Fix grinder using twice is recommended power
2016-11-05 17:36:48 +00:00
modmuss50
29b0d2443f
Large buff to power usage, should fix #769
2016-11-05 17:22:24 +00:00
modmuss50
51331b77e7
Adjust MFE and MFSU values, closes #777
2016-11-05 17:09:57 +00:00
modmuss50
916913337b
Fix #789
2016-11-05 10:43:00 +00:00
modmuss50
603c12590d
Update to support RC 2.8
2016-11-04 20:03:05 +00:00
modmuss50
796df6c055
Auto Format code
2016-10-08 20:46:16 +01:00
modmuss50
aefe9f6a36
Merge branch '1.10.2' of https://github.com/TechReborn/TechReborn into 1.10.2
2016-09-06 22:16:29 +01:00
modmuss50
d5ff2a42bb
Fixes #723 and wrench works with ic2 machines now
2016-09-06 22:16:21 +01:00
Utoc
2ae38dea9e
Slot index changes ( #734 )
...
Changes slot index values to allow machines to be pulled from.
2016-08-27 08:02:44 +01:00
modmuss50
d96149fc97
Revert "Power system re-write, recipe fixes."
...
This reverts commit d982cc4028
.
# Conflicts:
# src/main/java/techreborn/init/ModRecipes.java
2016-08-10 00:51:44 +01:00
modmuss50
aa05d906f9
Revert "Wires now transfer energy from all mods and manages it as EU. ( #686 )"
...
This reverts commit 6f54e3801f
.
# Conflicts:
# src/main/java/techreborn/tiles/storage/TileEnergyStorage.java
2016-08-10 00:45:33 +01:00
modmuss50
cdae866b2d
Revert "Rewrite to use new RebornCore Power API. Texture fixes."
...
This reverts commit b292fdd352
.
# Conflicts:
# src/main/java/techreborn/client/gui/GuiImplosionCompressor.java
# src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java
# src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java
# src/main/java/techreborn/client/gui/GuiVacuumFreezer.java
# src/main/java/techreborn/tiles/TileAlloyFurnace.java
# src/main/java/techreborn/tiles/TileAlloySmelter.java
# src/main/java/techreborn/tiles/TileAssemblingMachine.java
# src/main/java/techreborn/tiles/TileImplosionCompressor.java
# src/main/java/techreborn/tiles/TileIndustrialSawmill.java
# src/main/java/techreborn/tiles/TileVacuumFreezer.java
# src/main/java/techreborn/tiles/multiblock/TileBlastFurnace.java
# src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java
# src/main/java/techreborn/tiles/teir1/TileCompressor.java
# src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java
# src/main/java/techreborn/tiles/teir1/TileExtractor.java
# src/main/java/techreborn/tiles/teir1/TileGrinder.java
# src/main/java/techreborn/tiles/teir1/TileRecycler.java
2016-08-10 00:45:07 +01:00
modmuss50
8a0d981018
Revert "Fusion reactor fixes & rewrite, energy fixes."
...
This reverts commit 06fad2264f
.
2016-08-10 00:30:08 +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
a5a9460707
Automation fixes, upgrades fixes.
2016-07-27 17:51:03 +07: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
Dragon2488
0011553cf7
Sawmill changes & fixes.
2016-07-24 01:10:37 +07:00
Dragon2488
06fad2264f
Fusion reactor fixes & rewrite, energy fixes.
2016-07-22 21:45:55 +07:00
Dragon2488
b292fdd352
Rewrite to use new RebornCore Power API. Texture fixes.
2016-07-21 22:22:56 +07:00
Archengius
6f54e3801f
Wires now transfer energy from all mods and manages it as EU. ( #686 )
...
* Wires now transfer energy from all mods and manages it as EU. Multipart will fire in hell.
* Fix TechReborn to work with latest RebornCore
2016-07-21 07:51:55 -07:00
modmuss50
10aa2f2ffb
fix merge
2016-07-19 11:46:53 -07:00
Dragon2488
d982cc4028
Power system re-write, recipe fixes.
...
Please note that this version breaks all wires placed in worlds before.
2016-07-18 11:57:52 +07:00
al132
166f9a924f
Fixed Output of extractor ( #679 )
...
* Add CraftTweaker support for the Compressor
* Fix Extractor insertion and extraction
* Oops
2016-07-18 02:06:47 +01:00
Dragon2488
33df1d3319
Implemented Lightning Rod, improved ore dictionary integration for dusts, nuggets and plates. Plates now registers automatically for every gem and ingot in TR. ( #673 )
2016-07-16 10:44:54 +01:00
modmuss50
315c0aa509
Revert "Revert a shit load of stuff"
...
This reverts commit d25bb23e8e
.
2016-07-01 15:55:37 +01:00
modmuss50
d25bb23e8e
Revert a shit load of stuff
2016-07-01 15:40:46 +01:00