modmuss50
a4a4042eb1
Fix #775 , The oldest open bug, and it only took me 5 mins
2017-06-13 22:37:03 +01:00
modmuss50
cb0303d82f
Remove old int tiers
2017-06-13 20:28:50 +01:00
modmuss50
b1721890b5
Transformer improvements
2017-06-13 20:26:23 +01:00
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
modmuss50
d80280b110
Fix random world gen crash - Fix electric furnace and version bump
2016-06-04 17:03:22 +01:00
modmuss50
246113dfca
Fix generator being overpowered
2016-06-04 14:28:36 +01:00
Modmuss50
ae2e063440
Update TileBatBox.java
2016-06-04 14:22:48 +01:00
modmuss50
1fd58d8986
Improve matter fab
2016-05-28 19:33:17 +01:00
modmuss50
9fa5e560e1
Fixes #561
2016-05-23 17:09:38 +01:00
modmuss50
78ccf1bcfb
Tweak some power values, closes #564
2016-05-23 17:05:10 +01:00
modmuss50
128a95c338
jei 1.9.4 and clean tile packets
2016-05-19 09:07:31 +01:00
modmuss50
74d500a2fd
Update to minecraft version 1.9.4
2016-05-18 16:53:54 +01:00
modmuss50
960bac8cc2
Fix Server Crash
2016-05-13 07:46:17 +01:00
modmuss50
b0fbd5aea0
Update to support removal of ic2 api
2016-05-12 19:16:40 +01:00
modmuss50
a78b2b6745
Bump the windmill eu output
2016-05-09 21:24:37 +01:00
modmuss50
4cd4e4109b
Speed improvement
2016-05-09 18:33:01 +01:00
modmuss50
45e31c1aef
Added pump
2016-05-08 21:42:09 +01:00
modmuss50
c9f84375ac
Fixes #549 gui still needs syncing
2016-05-08 10:00:06 +01:00
modmuss50
e71953dc2a
Fixes #556 and fixes #550
2016-05-08 09:34:52 +01:00
modmuss50
4095a0b52d
Auto update mappings
2016-05-06 22:13:24 +01:00
modmuss50
a2d626bc61
Fixes #523
2016-04-23 13:32:03 +01:00
modmuss50
912eced5e5
Move assemblingmachine and centrifuge to the new system
2016-04-13 16:25:51 +01:00
modmuss50
b822cee9fb
Update walia, add MT and CT support back, Fix #519 , update for new RC bucket thing
2016-04-13 13:47:02 +01:00
modmuss50
23d55e6251
Work on the new container stuff
2016-04-12 08:33:38 +01:00
modmuss50
98d459735f
Implement IRecipeCrafterProvider on all tiles that need it
2016-04-11 17:50:00 +01:00
modmuss50
dded3c685a
Massive tile clean up, I might have broken something somewhere
2016-04-11 17:43:54 +01:00
modmuss50
ef133ab25b
Start on tile rewrite
2016-04-11 17:23:57 +01:00
modmuss50
bc7b5b2566
Fixes #511
2016-04-08 14:24:53 +01:00
Prospector
3b94b09194
Add Transformer configs
...
Closes #501
2016-04-03 15:20:35 -07:00
modmuss50
510f969c94
Auto remove un needed things in the code
2016-04-03 14:34:39 +01:00
modmuss50
7e7fcf2ad9
Made the api usefull
2016-04-03 14:25:46 +01:00
modmuss50
df61729d6f
Some work on the new api
2016-04-03 14:07:45 +01:00
modmuss50
3d819967be
Fixes #444
2016-04-01 20:22:55 +01:00
Stuart Pomeroy
02357ce1a4
Fix Tiles and Guis, closes #478 and closes #479
2016-03-29 20:27:23 +01:00
Stuart Pomeroy
4c2877d0d5
Rewrite Transformers, closes #441
2016-03-29 10:29:51 +01:00
Stuart Pomeroy
fbfd42427e
Fix wrench.
2016-03-29 10:01:18 +01:00
Stuart Pomeroy
4f9f98e1bd
Revert "Closes #443 , #466 , #468 "
...
This reverts commit faa6aa30d0
.
2016-03-29 09:58:32 +01:00
Stuart Pomeroy
faa6aa30d0
Closes #443 , #466 , #468
2016-03-29 09:58:07 +01:00
Stuart Pomeroy
2209177e1a
Fix config changes etc.
2016-03-28 20:51:23 +01:00
Stuart Pomeroy
427963b40a
Closes #434 , Add tooltips to grinder and batbox. Fix centrifuge. closes #436
2016-03-28 17:50:25 +01:00
Stuart Pomeroy
1dfa6c094f
Fix Energy Storage not outputting, closes #435
2016-03-28 17:01:36 +01:00
Stuart Pomeroy
6ff03bc706
Fix block item drops and such. Closes #428
2016-03-28 12:23:55 +01:00
Stuart Pomeroy
c25ab8227a
Update the Tiles for Storage. Also work on Drops. Not Finished.
2016-03-28 11:45:21 +01:00
Stuart Pomeroy
fffeb93ff1
Fix Solar panels
2016-03-28 10:09:26 +01:00
Stuart Pomeroy
1993fa92bd
Add MFE GUI and made batterys charge and decharge?
2016-03-28 09:34:48 +01:00
Stuart Pomeroy
dfb7d0afd4
Fix Merges
2016-03-27 20:14:13 +01:00
Stuart Pomeroy
78e8acce7b
Fixed some GUIS and some Mass Fabs
2016-03-27 20:10:49 +01:00
modmuss50
1ab2415e40
Fix crash, fix #414 and fix #411
2016-03-27 18:56:27 +01:00
Stuart Pomeroy
525a91e931
Fixes solar panels being powered wierdly...
2016-03-27 18:25:45 +01:00
modmuss50
49e45b27e2
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
2016-03-27 18:06:50 +01:00
gigabit101
c73d1dc773
closes #425
2016-03-27 19:05:05 +01:00
modmuss50
8261384cdd
Fixes #420
2016-03-27 18:06:40 +01:00
Stuart Pomeroy
8fba82312c
Closes #402,#404,406
2016-03-27 17:41:56 +01:00
Stuart Pomeroy
6498bd1974
Update to forge and fuck up the cables? Not sure :P
2016-03-26 15:58:38 +00:00
modmuss50
5eed5b161d
Code formatter take 2
2016-03-25 09:47:34 +00:00
modmuss50
33985f1a31
Revert "Added code formatter"
...
This reverts commit b9448d5d90
.
2016-03-24 00:41:47 +00:00
modmuss50
b9448d5d90
Added code formatter
2016-03-24 00:39:26 +00:00
gigabit101
710f9c04e7
gui fixs
2016-03-23 23:31:40 +00:00
gigabit101
6d1a8a835e
more gui things
2016-03-22 23:58:16 +00:00
gigabit101
123e704caf
fixed some machine drops
2016-03-22 23:34:43 +00:00
modmuss50
fee31761b1
Fix NPE
2016-03-20 19:51:41 +00:00
modmuss50
d8829fd33c
Fix some small issues
2016-03-20 16:27:57 +00:00
gigabit101
2fa00b9c7f
little fixs
2016-03-19 23:18:31 +00:00
modmuss50
e319398bc9
Merge remote-tracking branch 'remotes/origin/1.8.9' into 1.9
2016-03-16 17:09:34 +00:00
modmuss50
5a0f8be435
Added transformers
2016-03-16 16:54:44 +00:00
TheDoctorSoda
c4a00c8152
[TEXTURES] LV, MV, and HV transformers.
2016-03-15 11:03:26 -07:00
modmuss50
8c24711d4f
Optimise imports
2016-03-15 08:13:05 +00:00
modmuss50
e0547cecff
Merge remote-tracking branch 'remotes/origin/1.8.9' into 1.9
2016-03-15 08:07:06 +00:00
TheDoctorSoda
e90592403b
Added Scrapboxinator, reverted yellow energy outlines, added grinder textures
2016-03-14 21:53:05 -07:00
modmuss50
b7c71edf4f
Added MFE and MFSU blocks and tiles, gui and textures to come later
2016-03-14 08:34:15 +00:00
modmuss50
5480a5c3e5
Added batBox, gui to come later
2016-03-14 08:26:41 +00:00
modmuss50
cc0b762b56
87 errors, will finish later
2016-03-13 17:38:12 +00:00
modmuss50
b4a16c03ed
And 50 more errors fixed
2016-03-13 16:15:27 +00:00
modmuss50
9a40abbe78
Now comes the grind, 244 errors left
2016-03-13 16:08:30 +00:00
modmuss50
7f920b282f
Optimise imports to make it easier to find and replace package names
2016-03-13 15:37:55 +00:00
gigabit101
d069bf77e3
closes #377
2016-03-09 13:59:38 +00:00
gigabit101
e1cd18ad7d
closes #376
2016-03-09 13:46:08 +00:00
modmuss50
9ac1db6dc1
Fixes #375
2016-03-09 08:35:06 +00:00
modmuss50
7e5e40a338
Added machine teirs (can someone check them)
...
Fixed crash when machines explode
2016-03-08 17:34:04 +00:00
TheDoctorSoda
2221a303ad
Move thermal generator TE to proper package
2016-03-07 21:56:37 -08:00
modmuss50
67526480ad
Added walia support for the cables
2016-03-07 20:33:08 +00:00
gigabit101
626cbbbbc7
derp
2016-03-07 17:26:04 +00:00
gigabit101
080b633493
Finish up on recycler and temp jei handler
2016-03-07 14:07:52 +00:00
gigabit101
007f9266e5
Recycler output is now a random chance
2016-03-07 12:45:54 +00:00
gigabit101
77e2edc005
More work on recycler
2016-03-07 00:21:22 +00:00
gigabit101
02ac62a180
Started Recycler
2016-03-06 23:15:28 +00:00
gigabit101
e6c510bbea
Fixed machines returning wrong itemstack when wrenched
2016-03-06 21:03:20 +00:00
gigabit101
059b197d5c
More recipe tweaks
2016-03-06 21:00:42 +00:00
gigabit101
5f1d059058
Added logic to Electric furnace
2016-03-06 20:39:31 +00:00
gigabit101
87d41aaa53
Small code clean up
2016-03-06 20:14:42 +00:00
gigabit101
90f5d77a41
Finish on Iron furnace
...
Added Jei support to Iron Furnace
2016-03-06 19:59:39 +00:00
gigabit101
a84075ff69
Nerfed generator and fix generator gui
2016-03-06 15:42:12 +00:00
gigabit101
b7212bec69
Fixed generator not storing inv
2016-03-06 15:20:38 +00:00
gigabit101
e96fe4bea7
grinder now returns grinder
2016-03-05 23:31:22 +00:00
modmuss50
06d23b10b7
Remove overcomplicated powernet
2016-03-02 15:42:45 +00:00
modmuss50
80d5e00706
Power net work
2016-02-29 17:30:46 +00:00
modmuss50
e4b8918224
More work on the cables, and add items
2016-02-27 19:36:01 +00:00
modmuss50
1cd886e770
Made it compile
2016-02-27 19:03:10 +00:00
modmuss50
4b5d05a063
Started work on the new PowerNetwork
2016-02-27 19:02:28 +00:00
gigabit101
6549282ea0
Cleaned up imports
2016-02-26 13:03:30 +00:00
modmuss50
e3c71248a4
Added solar panel textures that are based on sate
2016-02-26 08:26:24 +00:00
modmuss50
ec054e09f6
Rebalance the windmill
2016-02-25 20:29:56 +00:00
modmuss50
d0392dabb8
Added wind and water mill
2016-02-25 20:03:58 +00:00
modmuss50
ed3d3c78b5
Added solar panel
2016-02-25 18:21:59 +00:00
modmuss50
b61acffc68
Generator logic
2016-02-24 16:11:07 +00:00
modmuss50
46cdf8f587
Fixes to configs, optimise imports.
2016-02-24 08:18:21 +00:00
gigabit101
0522e9539f
Added some textures
...
Added Tree Tap
Added Tree Tap logic
2016-02-20 22:50:24 +00:00
modmuss50
457178842c
Revert "Move IC2 api"
...
This reverts commit ac43b5afc4
.
2016-02-20 17:06:46 +00:00
modmuss50
ac43b5afc4
Move IC2 api
2016-02-20 17:02:28 +00:00
modmuss50
71c2bfee7f
Moved power system to RC and spawn trees in groups
2016-02-20 16:59:31 +00:00
gigabit101
047625389d
Added compressor, extractor, electric furnace
2016-02-20 03:07:56 +00:00
gigabit101
cd13932bde
Basic generator just needs logic
2016-02-20 02:21:44 +00:00
gigabit101
8ad4a45716
Added basic Grinder
2016-02-20 00:57:57 +00:00
modmuss50
415531587b
Fix incorrect merge
2016-01-16 13:11:08 +00:00
modmuss50
2a617919d9
Merge remote-tracking branch 'remotes/origin/1.7.10' into 1.8.9
...
# Conflicts:
# src/main/java/techreborn/compat/fmp/ForgeMultipartCompat.java
# src/main/java/techreborn/tiles/TileBlastFurnace.java
2016-01-16 13:09:09 +00:00
gigabit101
1ed3d226f2
Closes #320
2016-01-16 04:27:17 +00:00
modmuss50
7139a62102
Update to fixed Reborn core and bump version
2016-01-13 13:40:02 +00:00
modmuss50
b588e8c08a
IC2 Classic API support (This is all you are getting)
...
If this is broken I dont care, if it has broken other things I will care.
2016-01-07 10:46:13 +00:00
mezz
ad0b45cd2a
Add industrial sawmill recipes
2015-12-31 02:11:24 -08:00
mezz
5addee32e6
Add grinder recipes
2015-12-31 00:56:09 -08:00
modmuss50
2320ceb2c3
Fixed machines loosing state
2015-12-23 12:40:48 +00:00
Modmuss50
eedabb9e7d
Merge remote-tracking branch 'remotes/origin/master' into 1.8.8
...
# Conflicts:
# src/main/java/techreborn/client/gui/GuiGrinder.java
# src/main/java/techreborn/tiles/TileGrinder.java
2015-12-16 16:06:33 +00:00
Modmuss50
96a7b56b5f
Fixes #304
2015-12-16 15:56:12 +00:00
Modmuss50
5324016199
fixes #302
2015-12-16 11:07:34 +00:00
Modmuss50
fbc5291a1d
Merge remote-tracking branch 'remotes/origin/master' into 1.8.8
2015-12-14 18:14:12 +00:00
Modmuss50
23255bdfff
Fixes #301
2015-12-14 18:13:47 +00:00
Modmuss50
d5ce5cba04
Merge remote-tracking branch 'remotes/origin/master' into 1.8.8
...
# Conflicts:
# src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java
2015-12-12 11:41:21 +00:00
Modmuss50
cc6dfbc3c4
Fixes #295
2015-12-11 21:52:35 +00:00
Modmuss50
5c95b238fa
Fixes #296
2015-12-11 21:33:32 +00:00
modmuss50
40f78c3938
Merge branch 'master' into 1.8.8
...
Conflicts:
build.gradle
2015-12-05 20:30:20 +00:00
modmuss50
cf36bc9dc1
Fixes #293 and removed java doc
2015-12-05 20:23:40 +00:00
modmuss50
a795f90971
Update forge, fix ticking tiles.
2015-12-05 20:14:32 +00:00
modmuss50
3367e990be
Update to new forge and mappings
2015-11-29 09:52:45 +00:00
Modmuss50
b0784c44d2
Fixes for latest forge and more rendering.
2015-11-26 17:35:31 +00:00
Modmuss50
9f3622ea33
some more texture work
2015-11-25 21:03:55 +00:00
Modmuss50
bce444a4ff
0
2015-11-23 20:34:05 +00:00
Modmuss50
fe9d41ac76
50
2015-11-23 20:27:06 +00:00
Modmuss50
839647ed85
734
2015-11-23 19:51:40 +00:00
Modmuss50
30879a534a
859
2015-11-23 19:19:18 +00:00
Modmuss50
b88fe49ee2
1936
2015-11-23 18:41:29 +00:00
Modmuss50
92ca6548c6
2211
2015-11-23 15:15:42 +00:00
Modmuss50
fa9cd98b5a
4693
2015-11-23 14:47:50 +00:00
Modmuss50
011ebaba1d
4862
2015-11-23 14:45:16 +00:00
Modmuss50
f0a70fa478
5235
2015-11-23 14:40:30 +00:00
modmuss50
d545521d04
Added PlayerDectector closes #286
2015-11-22 11:16:54 +00:00
modmuss50
05e7ecf2f3
Removed sout lines
2015-11-22 10:33:21 +00:00
Modmuss50
806cf757a5
Fixes #264
2015-11-18 19:41:37 +00:00
Modmuss50
3f41e26ece
Fixes some issues with the fustion reactor.
2015-11-18 17:02:22 +00:00
Modmuss50
758d918bdb
Got the Vacuum Freezer working.
2015-11-18 08:35:34 +00:00
Modmuss50
3114576e7b
Most of the Vacuum Freezer(Not working just yet)
2015-11-17 21:48:06 +00:00
Modmuss50
7db2e0dc8c
Polish to the reactor
2015-11-16 21:50:09 +00:00