Commit graph

82 commits

Author SHA1 Message Date
alexpic57
c1dd9d9192 fix all? the tile to prevent bug duplication 2017-09-08 21:39:46 +02:00
drcrazy
ab1802ba5e Refactoring for translation 2017-09-08 02:03:35 +03:00
modmuss50
6f6800e75a
Rewrite wrench to use new API 2017-08-30 21:57:14 +01:00
David Vierra
a016a6dd49 Replace all emptiness checks == ItemStack.Empty with .isEmpty() (#1247)
Fixes #1157 and probably a few other things.
2017-08-25 11:08:15 -07:00
modmuss50
9edbdf5016
Closes https://github.com/TechReborn/TechReborn/issues/1158 for now 2017-06-29 12:56:33 +01:00
modmuss50
cb0303d82f
Remove old int tiers 2017-06-13 20:28:50 +01:00
modmuss50
df62000513
Found some more null itemstacks 2017-06-13 11:26:08 +01:00
modmuss50
b25742dde0
Auto format code 2017-06-12 14:23:32 +01:00
modmuss50
c7419ee8ac
Update to support new RC teir calculations 2017-06-09 14:53:24 +01:00
modmuss50
dd7005dc0a
Disable upgrade slots in electric furnace for now, closes #1064 2017-06-02 20:32:55 +01: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
34978f7ffe Remove old upgrade handler to make way for the new one. 2017-04-11 00:12:36 +01:00
modmuss50
26c208e811
Added license info to the header of all files. 2017-02-23 12:29:43 +00: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
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
Ourten
eb220643fc Change all containers init to IContainerProvider + Add Enum for gui ids handling 2017-01-08 20:34:46 +01: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
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
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
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
a5f306eb69 Fixes Compressor inputting items into output slot (#812) 2016-11-27 22:21:09 +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
b60941ddd4
Fix grinder using twice is recommended power 2016-11-05 17:36:48 +00:00
modmuss50
796df6c055
Auto Format code 2016-10-08 20:46:16 +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
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
Dragon2488
a5a9460707 Automation fixes, upgrades fixes. 2016-07-27 17:51:03 +07:00
Dragon2488
b292fdd352 Rewrite to use new RebornCore Power API. Texture fixes. 2016-07-21 22:22:56 +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
modmuss50
d80280b110 Fix random world gen crash - Fix electric furnace and version bump 2016-06-04 17:03:22 +01:00
modmuss50
9fa5e560e1 Fixes #561 2016-05-23 17:09:38 +01:00
modmuss50
74d500a2fd Update to minecraft version 1.9.4 2016-05-18 16:53:54 +01:00
modmuss50
b0fbd5aea0 Update to support removal of ic2 api 2016-05-12 19:16:40 +01:00
modmuss50
c9f84375ac Fixes #549 gui still needs syncing 2016-05-08 10:00:06 +01:00