Commit graph

473 commits

Author SHA1 Message Date
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
Prospector
a719a1c563 Holy huge commit with unhelpful name batman!
-Added TRNoDestroy (for items that do not use JSONDestroyer)
-Batteries now use item overrides to display different texture when empty
-Fixed diamond nugget unity texture
-Removed new fluid sources from JEI
-Fixed empty cell lang entry
2016-06-05 01:33:40 -07:00
modmuss50
fff952cb1a Fix pipe types 2016-06-01 12:30:20 +01:00
modmuss50
96235d2c9d Uses Reborncores version of MCMP 2016-06-01 12:06:51 +01:00
modmuss50
25ee0b5790 Remove old cells, now uses the DynamicCell, 9 new fluids that need a texture 2016-05-23 18:26:21 +01:00
modmuss50
74d500a2fd Update to minecraft version 1.9.4 2016-05-18 16:53:54 +01:00
modmuss50
3fb1e4ceb8 Some improvements to cable rendering 2016-05-16 15:09:59 +01:00
modmuss50
960bac8cc2 Fix Server Crash 2016-05-13 07:46:17 +01:00
modmuss50
7808400028 Fix z-flighting and fluid movement, uv's still need a look at 2016-05-11 11:17:17 +01:00
modmuss50
25280e9e7e Small improvements to cable rendering 2016-05-10 13:10:27 +01:00
modmuss50
62fd8f53f6 Added fluid pipe types 2016-05-09 17:27:22 +01:00
modmuss50
fd95cf7141 Some more work on fluid pipe rendering, I may recode it 2016-05-09 16:33:36 +01:00
modmuss50
13d70e1b95 Remove old 1.7 connected texture stuff 2016-05-09 11:15:08 +01:00
modmuss50
dd6e69bea5 Start work on fluid pipes 2016-05-09 11:13:52 +01:00
modmuss50
9c6e9aef64 Update to new forge registry system 2016-05-08 10:13:21 +01:00
modmuss50
4095a0b52d Auto update mappings 2016-05-06 22:13:24 +01:00
modmuss50
5773bf66d0 Added offhand stack power hub rendering 2016-04-27 17:19:06 +01:00
modmuss50
b2d5ee7b3d
Fixes #530 2016-04-23 13:23:11 +01:00
modmuss50
c66565a90f
Fixes cable rendering, closes #512 2016-04-19 08:26:37 +01:00
modmuss50
912eced5e5 Move assemblingmachine and centrifuge to the new system 2016-04-13 16:25:51 +01:00
modmuss50
8c49a27b76 allow AmbientOcclusion on cables 2016-04-13 16:13:03 +01:00
modmuss50
4fccaa1f5f Update AlloySmelter to new system 2016-04-12 08:39:50 +01:00
modmuss50
23d55e6251 Work on the new container stuff 2016-04-12 08:33:38 +01:00
modmuss50
ef133ab25b Start on tile rewrite 2016-04-11 17:23:57 +01:00
modmuss50
3c5e2b335a Fixes #497 2016-04-04 23:06:49 +01:00
modmuss50
510f969c94 Auto remove un needed things in the code 2016-04-03 14:34:39 +01:00
modmuss50
df61729d6f Some work on the new api 2016-04-03 14:07:45 +01:00
gigabit101
d61032cb07 closes #488 2016-04-01 13:11:06 +01:00
gigabit101
b035e87bc9 closes #491 2016-04-01 13:02:58 +01:00
Stuart Pomeroy
02357ce1a4 Fix Tiles and Guis, closes #478 and closes #479 2016-03-29 20:27:23 +01:00
Stuart Pomeroy
f9ea484159 Fix non fuels going in the fuel slot. 2016-03-29 10:45:43 +01:00
Prospector
cec54aa0c8 Fix lots of issues 2016-03-28 19:47:00 -07: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
6149511d0b Frickin. what. 2016-03-28 11:47:20 +01:00
Stuart
ca33b92cea Dont even know. 2016-03-28 11:47:01 +01:00
Stuart Pomeroy
1993fa92bd Add MFE GUI and made batterys charge and decharge? 2016-03-28 09:34:48 +01:00
modmuss50
877308a75c Some small tweaks 2016-03-27 19:23:38 +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
Prospector
b08ca6b91c Diesel and Semifluid generator GUI textures
Closes #421
2016-03-27 10:57:31 -07:00
Stuart Pomeroy
8fba82312c Closes #402,#404,406 2016-03-27 17:41:56 +01:00
Stuart Pomeroy
77818b609e Fix Grinder GUI 2016-03-26 17:16:09 +00:00
Stuart Pomeroy
c4345bacae Fix a fuck up. 2016-03-26 16:01:06 +00: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
1a580bb1d1 Fixed guis 2016-03-23 21:36:58 +00:00
gigabit101
6d1a8a835e more gui things 2016-03-22 23:58:16 +00:00
gigabit101
5ea4dedcb2 Fixed some progress bars 2016-03-22 23:27:35 +00:00
gigabit101
1acdc13e2d Guis for batbox, mfe, mfsu 2016-03-21 15:52:46 +00:00
gigabit101
8f382f2239 stuff and things 2016-03-21 15:30:32 +00:00
modmuss50
d8829fd33c Fix some small issues 2016-03-20 16:27:57 +00:00
Rushmead
af9ed84015 Fixed Cable rendering 2016-03-20 15:44:19 +00:00
modmuss50
492917ac95 Improvements to cable rendering. still broken, but not as bad 2016-03-20 10:58:58 +00:00
modmuss50
471a945de6 Its all broke, mcmultipart support 2016-03-19 18:01:34 +00:00
modmuss50
00fc80b071 Merge remote-tracking branch 'remotes/origin/1.8.9' into 1.9 2016-03-16 16:26:44 +00:00
modmuss50
65a64e650b Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9 2016-03-16 15:52:36 +00:00
modmuss50
929d2f4b7f Improvements to the nuke, rendering needs fixing 2016-03-16 15:52:27 +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
cc0b762b56 87 errors, will finish later 2016-03-13 17:38:12 +00:00
modmuss50
7a121be651 Some small fixes 2016-03-13 16:57:10 +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
modmuss50
05ee9f30f4 Nuke. 2016-03-13 11:50:46 +00:00
gigabit101
a938a1ab4d Thermal gen now shows stored power in gui 2016-03-09 15:03:09 +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
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
5f1d059058 Added logic to Electric furnace 2016-03-06 20:39:31 +00:00
gigabit101
90f5d77a41 Finish on Iron furnace
Added Jei support to Iron Furnace
2016-03-06 19:59:39 +00:00
gigabit101
961e821402 Start on Iron furnace 2016-03-06 15:58:34 +00:00
gigabit101
a84075ff69 Nerfed generator and fix generator gui 2016-03-06 15:42:12 +00:00
modmuss50
71062a55bd Fusion reactor now kills the player, coils to come soon 2016-03-05 19:09:07 +00:00
modmuss50
1e24d1f116 Texture Rendering for cables 2016-03-05 18:10:36 +00:00
modmuss50
a94039a5c2 More cable work 2016-03-05 14:24:31 +00:00
modmuss50
7d514b718a Fixes #369 and fixes rubber tree spikes not decaying 2016-03-05 11:37:29 +00:00
modmuss50
0204ddc539 Cables render, need textures 2016-03-05 11:19:33 +00:00
modmuss50
e3c150c06e Inital cable rendering
This only took 2 hours :/
2016-03-05 10:48:13 +00:00
modmuss50
0b04bb8c69 Some more work on rendering 2016-03-04 19:47:08 +00:00
modmuss50
df9c159435 Ported the rendering code 2016-03-02 16:45:49 +00:00
modmuss50
1d72578973 Remove commented out code 2016-03-02 16:33:59 +00:00
TheDoctorSoda
21c5866d0d [TEXTURES] scrapBox.png
not sure why it says the semifluid generator was updated...I didn't change anything
2016-02-26 19:42:35 -08:00
gigabit101
6549282ea0 Cleaned up imports 2016-02-26 13:03:30 +00:00
modmuss50
bb6b53490b Fix build issue 2016-02-25 20:27:58 +00:00
gigabit101
82d2de7eb1 Start on the new manual 2016-02-25 18:25:52 +00:00
gigabit101
fb12bfab9e Changed upgrade slots to SlotUpgrade 2016-02-25 14:21:31 +00:00
gigabit101
1dbb03cf75 Added some grinder recipes
Added copper and tin blocks closes #351
2016-02-25 13:59:22 +00:00
modmuss50
fff846b512 RF power tool tips, tell me where I missed them 2016-02-24 21:10:44 +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
TheDoctorSoda
90932acab9 Add iron fence and fence gate
Cannot for the life of my figure out why the iron fence gate block won't render correctly. The blockstate isn't being called. Hopefully I can figure out in the morning
2016-02-22 00:11:19 -08:00
modmuss50
28dd5044e6 Fixes #347 2016-02-21 14:16:55 +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
9a585bcfb2 Merge branch '1.7.10' into 1.8.9
Conflicts:
	build.gradle
	src/main/java/techreborn/blocks/BlockOre.java
	src/main/java/techreborn/items/ItemCells.java
2016-02-16 13:49:25 +00:00
modmuss50
25777b3f96 Fixes #217 2016-02-16 10:00:03 +00:00
modmuss50
c0ebf03f72 fixes #326 2016-02-16 09:20:26 +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
686dd71caf Add rolling machine recipes 2015-12-31 03:20:04 -08:00
mezz
090de63608 Add Vacuum Freezer recipes 2015-12-31 02:27:07 -08:00
mezz
ad0b45cd2a Add industrial sawmill recipes 2015-12-31 02:11:24 -08:00
mezz
3fde850448 Add Industrial Electrolyzer recipes 2015-12-31 01:40:56 -08:00
mezz
aed7b5c0c4 Add implosion compressor recipes 2015-12-31 01:07:35 -08:00
mezz
5addee32e6 Add grinder recipes 2015-12-31 00:56:09 -08:00
mezz
c187f931ce Add chemical reactor recipes 2015-12-30 23:30:09 -08:00
mezz
bb82e2cfb2 Add centrifuge recipes 2015-12-30 23:13:02 -08:00
mezz
ff571d5444 Add blast furnace recipes 2015-12-30 22:28:58 -08:00
mezz
05d8a5c787 Add assembling machine recipes 2015-12-30 22:28:39 -08:00
mezz
4b804c3521 Add alloy furnace recipes 2015-12-30 21:17:20 -08:00
Modmuss50
f17cd36815 Update merged commits to 1.8.8 2015-12-16 17:13:17 +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
3fb7dd102b Inital Just Enough Items support 2015-11-29 10:42:34 +00:00
Modmuss50
9f3622ea33 some more texture work 2015-11-25 21:03:55 +00:00
Modmuss50
f12725b4e0 Fixed charge hud, and clocking device. 2015-11-25 08:28:28 +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
806cf757a5 Fixes #264 2015-11-18 19:41:37 +00:00
Modmuss50
0f09088813 Fixes #282 2015-11-18 18:36:00 +00:00
Modmuss50
3f41e26ece Fixes some issues with the fustion reactor. 2015-11-18 17:02:22 +00:00
Modmuss50
93d1ff57b7 Fixed in world multiblock preview 2015-11-18 11:10:03 +00:00