Commit graph

574 commits

Author SHA1 Message Date
modmuss50
17427e675e Fixes https://github.com/TechReborn/TechReborn/issues/1693 and Fixes https://github.com/FTBTeam/FTB-Sky-Odyssey/issues/102 2019-03-25 21:37:27 +00:00
modmuss50
1d78c60e51 Superconductor update, adds cables, and new upgrades. 2019-03-23 18:03:41 +00:00
drcrazy
96bbe75c60 Removed unused imports 2019-03-11 02:22:49 +03:00
modmuss50
5397b26cf2 Machine cases drop them selves to fix https://github.com/FTBTeam/FTB-Ultimate-Reloaded/issues/90 2019-02-25 17:25:06 +00:00
coderbot16
fbec0c89c2 Finalize IC2 electric item support (#1644)
* Item charging no longer uses CapabilityEnergy, now fully uses ExternalPowerSystems

* Remove accidental update from build.gradle

* Remove some unused imports

* Use requestEnergyFromArmor in all powered tools
2018-12-28 09:25:40 +00:00
coderbot16
a766cdfa53 Remove almost all explicit uses of CapabilityEnergy (#1643)
* Battery packs (ItemLithiumBackpack/ItemLapotronPack) still use CapEnergy explicitly, but don't charge IC2 items.
 * Note: Before we can remove FE, we have to modify StackInfoHUD and ItemUtils in RebornCore.
2018-12-27 13:58:55 +00:00
modmuss50
7433eb7630 Fix bad rename 2018-12-08 22:05:36 +00:00
modmuss50
7db621fbed Abstract ic2 in RebornCore, rewrite Reborn Core's configs 2018-12-08 20:15:20 +00:00
drcrazy
7ce4a022af Cables got tooltip update. Closes #1627 2018-11-07 03:03:26 +03:00
drcrazy
6d3d1f2df2 Organized items. MOved creative tab setter to parent. 2018-09-07 14:51:41 +03:00
drcrazy
c56da8cf18
Use static fuse in static way. cherry-pick from: 8cac9a9315 2018-09-07 12:21:34 +01:00
Modmuss50
c1be3fb765
Fixes https://github.com/FTBTeam/FTB-Continuum/issues/428 2018-08-27 18:23: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
8139b865a9
Fix potential issues 2018-07-26 18:16:59 +01:00
drcrazy
7be239adca Updated wrenching logic for energy storages and casings. Closes #1543 2018-06-15 18:18:32 +03:00
drcrazy
24bce3ce66 Updated wrenching for lamp and alarm 2018-06-15 17:26:43 +03:00
drcrazy
8d1c116df0 Updated wrench logic for cables. 2018-06-15 16:49:46 +03:00
ProfessorProspector
603e346c0f New ore textures 2018-06-14 19:17:53 -07:00
ProfessorProspector
9ed05fb7ff Merge branch '1.12' of https://github.com/TechReborn/TechReborn into 1.12
# Conflicts:
#	src/main/java/techreborn/blocks/BlockAlarm.java
2018-06-14 10:57:07 -07:00
ProfessorProspector
cfda5fd2a4 Merge branch '1.12' of https://github.com/TechReborn/TechReborn into 1.12
# Conflicts:
#	src/main/java/techreborn/blocks/generator/BlockCreativeSolarPanel.java
#	src/main/java/techreborn/blocks/generator/BlockWaterMill.java
#	src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java
#	src/main/java/techreborn/blocks/storage/BlockLSUStorage.java
#	src/main/java/techreborn/blocks/transformers/BlockTransformer.java
2018-06-14 10:53:32 -07:00
drcrazy
c409b67c3c Updated block wrenching 2018-06-14 18:32:41 +03:00
drcrazy
77e1c54b86 Fixed inventory drop for DSU. More work on #1543 2018-06-14 18:32:40 +03:00
drcrazy
42bc110cb2 Fixed build, but DSU blocks are not done yet. 2018-06-13 17:42:46 +03:00
drcrazy
e2225b06d4 Updated wrenching logic. Some work for #1543 2018-06-13 15:28:31 +03: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
60c8527f6d
Rubber plank stairs and slab 2018-06-08 21:05:56 +01:00
drcrazy
93e324cc11 Fixed electric tree tap. Closes #1535 2018-06-08 15:46:28 +03:00
modmuss50
959e318859
Add energy storage to RebornCore's wrenableBlocks list 2018-05-26 20:38:47 +01:00
drcrazy
1ad23439eb Cleaned up supressed warnings 2018-05-25 14:24:35 +03:00
modmuss50
c20e1c72a9 Fixes #1515 2018-05-17 11:00:35 +01:00
drcrazy
ed9cdc7353 GUI update for assembly machine. Some work for #1512 2018-05-08 18:05:49 +03:00
modmuss50
1c10c199ae Fixes some issues with the storage chests, closes #1481 2018-05-04 12:06:40 +01:00
drcrazy
45669e8aa9 Formatting + set proper frame drop for advanced machines 2018-04-28 13:16:50 +03:00
drcrazy
649a6bf67f More sorting work. 2018-04-27 18:15:56 +03:00
drcrazy
de61d24082 Sorted out blocks between tiers 2018-04-27 18:06:57 +03:00
drcrazy
97e8fd7270 Changed names for parameters in createTE. 2018-04-27 17:54:19 +03:00
modmuss50
08a6d309d7
Fix server crash, closes #1495 and closes #1496 2018-04-22 13:22:09 +01:00
modmuss50
83e4ad98e1
Add configs to cables, closes #1491 2018-04-21 16:32:04 +01:00
modmuss50
53ce1828d1 Small tweaks 2018-04-18 17:33:11 +01:00
modmuss50
09a75893e4 Add larger fusion reactor sizes 2018-04-18 15:46:56 +01:00
modmuss50
10106715d3 Right click the fusion control computer with coils to autoplace them. 2018-04-18 15:07:28 +01:00
modmuss50
75b8c4d317
Fix #1485 2018-04-14 00:02:50 +01:00
modmuss50
9b23945670
Fix block inventory dropping in some situations 2018-04-12 15:42:09 +01:00
modmuss50
fbd4854f30
Fixes #1480 2018-04-12 13:42:55 +01:00
drcrazy
fef10740ba
Feature/fluidreplicator (#1482)
Added Fluid Replicator multiblock machine.
2018-04-12 15:42:12 +03:00
drcrazy
45361a6b46 Last piece of refactoring due to TileGenericMachine intro. 2018-04-02 18:12:58 +03:00
drcrazy
54ee781bc7 More refactoring for tier1 machines. 2018-04-02 16:58:03 +03:00
drcrazy
80e36f0427 Fixed typos for tier1 tiles folder. New abstract TR machine class 2018-04-02 16:18:48 +03:00
drcrazy
3e8b63645b Fixed license header. 2018-03-23 13:21:18 +03:00