Commit graph

408 commits

Author SHA1 Message Date
ProfessorProspector
b3988e4c4f Register cables in preinit, and switch cable items and storage blocks to jsons 2016-12-11 22:25:27 -08:00
ProfessorProspector
e6ba58eb45 Fusion Coils now use jsons 2016-12-11 18:22:35 -08:00
ProfessorProspector
7379e32a17 Ores use json 2016-12-11 18:05:03 -08:00
ProfessorProspector
49f227ca81 MORE JSONS: UU matter, upgrades, scrapboxes, and rubber sapling! Also fix rubber sapling model 2016-12-11 17:27:39 -08:00
ProfessorProspector
8012abee3b Move dusts and smalldusts to json 2016-12-11 11:34:56 -08:00
ProfessorProspector
3da6083c68 Nuggets now use jsons, and nuggets now return proper subtypes 2016-12-11 10:58:20 -08:00
ProfessorProspector
03b0aef687 slight adjustment #betaBuild 2016-12-10 21:56:00 -08:00
ProfessorProspector
86b98cab13 Unify tooltip messages, fix cable subtypes, and fix ruby drops 2016-12-10 18:13:27 -08:00
ProfessorProspector
2911e7f0ca Move ingots, plates, and gems to jsons 2016-12-10 00:15:39 -08:00
ProfessorProspector
89ffb5d047 More jsons! 2016-12-09 22:50:26 -08:00
ProfessorProspector
20193b562a Switch frequency transmitter, chainsaws, drills, and jackhammers to jsons 2016-12-09 17:01:19 -08:00
ProfessorProspector
226c0bc619 Improve energy bars on items 2016-12-08 18:39:49 -08:00
ProfessorProspector
467544ebfe Much improve the StackInfoHUD and move it to RC 2016-12-07 22:09:13 -08:00
modmuss50
24455a148c Fix build #betabuild 2016-12-07 13:55:36 +00:00
modmuss50
3f8128d890 Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11 #betabuild
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/client/container/ContainerAlloyFurnace.java
#	src/main/java/techreborn/items/tools/ItemWrench.java
2016-12-07 13:52:48 +00:00
modmuss50
0208ec58f2 Only allow correct inputs to alloy smelter, should aid with automation. closes #813 2016-12-07 13:35:51 +00:00
modmuss50
5dff31d937 A bunch more null check \o/ 2016-12-06 18:22:18 +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
modmuss50
54eee49e5d
Fix #810 2016-11-27 18:31:50 +00:00
modmuss50
7fb93e89e7
Fix #808 2016-11-26 19:15:55 +00:00
modmuss50
757e311804
Fix #804 2016-11-26 19:01:10 +00:00
modmuss50
e16c3eba02 Auto format 2016-11-25 13:25:51 +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
9af69638e2
Fix #793 2016-11-05 10:39:13 +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
a5550b9bb4 Fix a load of issues 2016-09-19 20:58:34 +01:00
modmuss50
0f8bb12fea Fix missing gui textures 2016-09-19 20:21:47 +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
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
2b148f3d68 Properly fluid rendering in dynamic cells. Temporary fix of recipes incapability with renamed (or tagged) cells. Merge dynamic and empty cells into one item. Right click on fluid block fills cell with fluid. 2016-07-15 12:15:09 +07: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
be336ec249 Fix ChargeHud 2016-06-06 20:22:56 +01:00
Prospector
4c01fa8864 Started work on fixing nanosaber 2016-06-05 03:57:38 -07:00