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
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
9283e46a1f
Fixes #275 and added world placement helper for reactor
2015-11-17 11:12:58 +00:00
Modmuss50
50a45560ab
Fixes #274 and Fixes #268
2015-11-17 07:52:47 +00:00
Modmuss50
3fc8587200
Added info to the gui
2015-11-16 21:51:14 +00:00
Modmuss50
7db2e0dc8c
Polish to the reactor
2015-11-16 21:50:09 +00:00
Modmuss50
a63128aa7e
Added Fusion Reactor
2015-11-16 21:10:39 +00:00
Modmuss50
f42c127201
Added basic fustion reactor multiblock checking.
2015-11-16 15:20:19 +00:00
Modmuss50
100293fb8e
Started work on reactor.
2015-11-16 13:36:44 +00:00
gigabit101
0ebf0c95dd
more charge slots
2015-11-13 16:29:35 +00:00
Modmuss50
08a3636e72
Fixes #260
2015-11-12 21:00:03 +00:00
gigabit101
a499cf2b09
Removed fake output slot from rolling machine closes #259
2015-11-12 20:50:58 +00:00
gigabit101
322cc072a8
Merge branch 'master' of https://github.com/TechReborn/TechReborn
2015-11-12 20:46:44 +00:00
gigabit101
4d6f961b9c
Fixed Implosion Compressor gui closes #261
2015-11-12 20:46:37 +00:00
Modmuss50
c0665e5c80
Fixes #257
2015-11-12 20:41:01 +00:00
gigabit101
320d06e39e
Fixed Digital Chest not counting the ItemStack in output slot
2015-11-12 20:22:41 +00:00
Modmuss50
7e07320844
Removed unused imports
2015-11-12 19:50:20 +00:00
gigabit101
c2dcaf1902
Fixed Quantum Chest/Digital Chest stored items closes #247
2015-11-11 21:37:31 +00:00
Modmuss50
9b6383a548
fixes #251
2015-11-11 18:38:43 +00:00
Modmuss50
6ab71cb612
Fixed compile error
2015-11-11 15:28:20 +00:00
Modmuss50
47a466ef21
Some fixes for #242
2015-11-11 15:24:13 +00:00
modmuss50
d4222693c0
Cleaned up Item Power System
2015-11-08 13:59:36 +00:00
modmuss50
ef03cf50a9
Merge branch 'master' of https://github.com/TechReborn/TechReborn
...
Conflicts:
src/main/java/techreborn/asm/LoadingPlugin.java
src/main/java/techreborn/client/gui/GuiBlastFurnace.java
src/main/java/techreborn/client/render/MultiblockRenderEvent.java
src/main/java/techreborn/compat/recipes/RecipesIC2.java
src/main/java/techreborn/init/ModItems.java
src/main/java/techreborn/lib/Location.java
src/main/java/techreborn/packets/PacketPipeline.java
src/main/java/techreborn/partSystem/fmp/CableConverter.java
2015-11-08 12:34:18 +00:00
modmuss50
8abf6e5282
Moved to RebornCore
2015-11-08 12:15:45 +00:00
Modmuss50
2c56961289
Fixes #226
2015-11-03 11:18:22 +00:00
Modmuss50
65d20ec431
Fixes #221 and hides the multiblock when the world is closed.
2015-11-02 15:15:22 +00:00
MrBretzel
1307406e10
Adding iron alloy smelter to not enough items and fix ChargedHud possible crash
2015-11-01 23:10:32 +01:00
modmuss50
50a830a101
Fixes #207
2015-11-01 16:45:58 +00:00
modmuss50
bffbd31cab
Sort of Revert "why was this done twice"
...
This reverts commit 363adeb681
.
Fixes #209
2015-11-01 16:24:35 +00:00
modmuss50
12cfe38a50
Fixes #212 now you need to hold shift to see our info
2015-11-01 16:10:36 +00:00
modmuss50
2f88e819a3
Mulitblock preview now renders behind the block.
2015-11-01 16:04:19 +00:00
gigabit101
824d7d0e8e
Added button to blast furnace gui to show multiblock in world
2015-11-01 15:58:06 +00:00
modmuss50
dabe79a877
Removed ChatColor and replaced with ChatFormatting
2015-10-25 18:55:49 +00:00
modmuss50
cf34fe1f1f
Large improvement to power system, fixes #204
2015-10-25 09:58:57 +00:00
MrBretzel
2c1950df75
Possible fix for #201
...
Possible fix for #201
2015-10-23 06:32:30 +02:00
modmuss50
95d51a7cb7
fixes #199 and closes #200
2015-10-22 21:23:17 +01:00
modmuss50
50fa2e8a1d
Fixes #194
2015-10-22 18:19:05 +01:00
Modmuss50
9d824e76ca
Most of the stuff uses the new item power net now
2015-10-14 21:37:21 +01:00
gigabit101
90f0b0ae5b
Little work on multiblock page
2015-10-09 23:16:44 +01:00
gigabit101
14b387dd56
closes #180
2015-10-09 22:31:26 +01:00
gigabit101
4a12aaf581
closes #178
2015-10-09 22:23:21 +01:00
gigabit101
891a5f5d19
closes 179
2015-10-09 22:19:38 +01:00
gigabit101
a8ea0f55e7
Removed a load of un needed junk from other versions of Gtech
2015-10-09 21:55:54 +01:00
Modmuss50
20a57d298f
Massive improvement to parts, should work a lot better now
...
@gigabit101 you asked for it, now you just need to place covers on ic2
cables, and you can place covers in the conecting bit.
Also fixes, slow responsiveness when placing/breaking cables
Also fixes cables rendering incorectally when a cover is placed between
two cables.
2015-10-05 17:39:52 +01:00
modmuss50
b0c77d4d22
Fixed server crash
2015-10-03 20:29:02 +01:00
modmuss50
fd4f52e27e
Fixed some issues with cables when using ic2 classic.
2015-10-03 19:21:28 +01:00
Modmuss50
f5c31a6a31
Added connected textures for the lesu
2015-09-26 16:13:42 +01:00
Modmuss50
d942e6f52e
Added connected textures to advanced machine casing.
2015-09-26 15:47:54 +01:00
Modmuss50
fcec162559
inital connected textures, still needs some work.
2015-09-26 13:54:58 +01:00
Modmuss50
628fb11961
Some code work on the connected texture system, will be redone to use 2 textures not one.
2015-09-26 13:10:12 +01:00
Modmuss50
bc5d9cf88b
Started work on custom connected texture system
...
This will make the textures at runtime, so we will only need to have 2
sprites to do it
2015-09-26 09:16:08 +01:00
Modmuss50
081f16a533
Removed Farm
2015-09-23 18:58:46 +01:00
gigabit101
61120ed30b
Added Ae2 and Logistic pipe support to Quantum Chest
2015-09-07 20:48:35 +01:00
modmuss50
e02b1518d2
updates to the aesu gui
2015-09-05 21:09:37 +01:00
Modmuss50
adf6c95331
Small improvements to the multiblock renderer
2015-09-05 15:29:21 +01:00
modmuss50
eb25b96355
fixes #129
2015-08-26 10:48:09 +01:00
modmuss50
2e00382632
Some work for #115
2015-08-26 10:37:28 +01:00
gigabit101
6f549337cd
Added version page
2015-08-17 16:51:58 +01:00
modmuss50
5b2bc53cfc
Added gui elements to rolling machine. Fixes #95
2015-08-16 12:03:22 +01:00
modmuss50
2ff03573d9
Added logic to alloy furnace
2015-08-10 19:28:52 +01:00
gigabit101
f58fbfe0e8
Added alot of work on the PDA still {WIP}
2015-08-10 18:30:19 +01:00
gigabit101
d41f7470b9
fixed localization for sawmill gui
2015-08-09 18:35:35 +01:00
modmuss50
e0ab0af822
Reformatted all the code using the default intelji formatting options.
2015-08-09 11:05:32 +01:00
modmuss50
2f63a24070
Small improvements to the version checker
2015-08-09 10:57:13 +01:00
modmuss50
009bf28b95
Added version checker
2015-08-06 18:39:13 +01:00
modmuss50
79f14f8be6
Fixes Crash without CodeChickenLib installed closes #94
2015-08-05 15:10:29 +01:00
modmuss50
5927eaca4c
Recoded idsu, closes #81
2015-07-26 16:01:27 +01:00
modmuss50
f433aa706a
Fixed crashing when ic2 is not installed
2015-07-26 15:35:02 +01:00
modmuss50
26f63e04f7
some small changes
2015-07-25 17:11:03 +01:00
modmuss50
496151fcae
Fixed aesu powers in creative tab, more work moving away from ic2 core and only needing ic2 api
2015-07-23 13:42:20 +01:00
modmuss50
e9ece63a99
Initial untested port to new internal power system.
...
This resets all the machines internal power buffer
2015-07-23 12:52:51 +01:00
modmuss50
62e5ccddd0
Merge branch 'master' of https://github.com/TechReborn/TechReborn
2015-07-23 09:38:28 +01:00
modmuss50
79235f15ba
Fixed gui's changing colour while in f3
2015-07-23 09:38:08 +01:00
gigabit101
ab72f7dced
Started adding progress bars to other machines
2015-07-21 17:53:43 +01:00
gigabit101
0880ffac72
Added configs to Aesu
2015-07-21 17:53:20 +01:00
gigabit101
f96e55737f
fixed charge hud showing when disabled closes #84
2015-07-21 14:49:05 +01:00
modmuss50
462aa20710
Fixed the BlastFurnace
2015-07-20 15:19:23 +01:00
modmuss50
29398d50dd
Added Farm inventory cable
2015-07-14 17:18:00 +01:00
modmuss50
c160abf176
Started work on the farm, some changes to the idsu, its still broken
2015-07-13 13:54:44 +01:00
gigabit101
a07af2d70d
moved battery slot on Centrifuge to correct position
2015-07-06 16:49:11 +01:00
gigabit101
26eff9bcbf
Removed fluid tank from IndustrialElectrolyzer closes #58
2015-07-02 23:39:36 +01:00
modmuss50
4ae1293535
Optimised all imports
2015-07-02 19:51:24 +01:00
modmuss50
33898edf7c
Rewritten cable render, removed hard dep of QLIb :)
2015-07-02 19:49:30 +01:00
modmuss50
a71b399765
Moved the lesu to the new system, looks like its stripping every thing ;'(
2015-07-01 20:34:22 +01:00
Gig
40a97145dc
fixed a important check
2015-06-29 23:18:21 +01:00
Gig
bfe0d57bc7
Started on ChargeBench only slot 0 works atm
2015-06-29 18:03:40 +01:00
TheQuantumGeneral
dfc105cb64
Update ContainerThermalGenerator.java
...
making it only accept fluid containers
2015-06-29 19:07:05 +10:00
Gig
ad12de30d3
Added recipe to get rubydust from rubys
2015-06-28 19:57:35 +01:00
Gig
3c4439ec5c
Sawmill now needs multiblock
2015-06-27 16:10:43 +01:00
Gig
a5a8265c8b
Sawmill now renders fluids and so dose recipe handler
2015-06-27 16:07:11 +01:00
Gig
d1196d0a7c
Removed Recipes button and moved to progress bar
2015-06-27 10:01:39 +01:00
Gig
6e74b9197b
IndustrialElectrolyzer now uses fluids
...
IndustrialElectrolyzer now renders fluids in gui
IndustrialElectrolyzer recipe handler now renders fluids
2015-06-26 17:56:09 +01:00
Gig
6cc1071961
made Dungeon loot easy to add
2015-06-26 17:22:58 +01:00
Gig
805f02effb
Moved Blast furnace heat value in gui
2015-06-26 01:31:47 +01:00
Gig
c11086243b
Missing Multiblock message can now be localized
2015-06-26 01:28:18 +01:00
Gig
759346f388
Added Missing Multiblock to gui's
2015-06-26 01:15:44 +01:00
modmuss50
37467cab7e
Some improvements to render speed of cables
2015-06-25 20:10:03 +01:00
Gig
17c8f4d253
Fixed grinder progress bar closes #45
2015-06-25 16:18:10 +01:00
Gig
54845b8777
Test fix for server craft
2015-06-24 01:15:19 +01:00
modmuss50
5fbe42c026
some tweaks to the values
2015-06-22 18:32:08 +01:00
modmuss50
74a9ace574
rewritten matter fab
...
Take 3 should be good :)
2015-06-22 17:10:06 +01:00
modmuss50
43da219936
Some clean up of some code
2015-06-21 14:17:47 +01:00
Gig
c6bc7f6fb8
Little more work on pda lots more to do
2015-06-20 11:24:04 +01:00
Gig
95c57bccf0
small hud changes looks a littlie better
2015-06-20 10:30:52 +01:00
joflashstudios
4fb6f4aca6
Fixed some LESU things
...
EU/t and capacity are now config-driven. Note that while the "max-eu" updates when you remove LESU storage blocks, it's currently retaining the highest EU/t you get, so if you remove blocks, the GUI still says it has the same EU/t you had before you removed them. Also shortened EU display.
2015-06-19 22:31:56 -04:00
joflashstudios
238901323c
Some hud tweaks
2015-06-19 20:03:31 -04:00
modmuss50
d30c251b8f
fixes #40
2015-06-19 18:13:05 +01:00
Gig
3688c7d838
Convert to ints
2015-06-19 17:54:52 +01:00
Gig
eb37bf274a
Chargehud displays ints and no doubles
2015-06-19 17:49:31 +01:00
modmuss50
a38899184d
Some work, need to fix somethings at a later date
2015-06-18 21:10:26 +01:00
Gig
45d0f36286
Removed some unneeded imports to avoid missing dependence crashs
2015-06-18 20:36:56 +01:00
modmuss50
da4d56ac0f
Some small fixes
2015-06-17 17:33:57 +01:00
modmuss50
598badc375
A load of work on the system, seams a lot is broken.
2015-06-17 17:01:26 +01:00
modmuss50
d8e6e88797
updated some CofhLib Files trying to fix text rendering, still not working
2015-06-17 11:24:41 +01:00
modmuss50
74525d260a
Some small changes to the gui code
2015-06-17 11:14:46 +01:00
modmuss50
90be01753b
Added repackaged cofh lib to help with the IDSU gui
2015-06-17 08:35:45 +01:00
modmuss50
70fb58f704
work on the gui list
2015-06-16 13:38:46 +01:00
joflashstudios
d5a1494784
A bit of hud code cleanup
2015-06-14 20:12:19 -04:00
joflashstudios
03e252ef84
Fixes #33
2015-06-14 20:09:29 -04:00
Gig
98c8f43b84
Added keybinding to toggle if hud is shown
2015-06-14 20:53:05 +01:00
Gig
59d4199260
More hud changes
2015-06-14 20:04:14 +01:00
Gig
f5e0e4bd87
Merge branch 'master' of https://github.com/TechReborn/TechReborn
2015-06-14 19:41:45 +01:00
Gig
8ca96b8f27
Small changes to hud
2015-06-14 19:41:41 +01:00
Tntrololol
4deab0c4ac
Merge remote-tracking branch 'origin/master'
2015-06-14 13:35:03 -05:00
Tntrololol
083696280c
Some GUI fixes
2015-06-14 13:34:52 -05:00
Gig
1b20c3fcb0
Hud color changes depending on current charge
2015-06-14 19:34:14 +01:00
modmuss50
11a7b42689
polishing the lesu.
2015-06-14 16:54:49 +01:00
modmuss50
c9c664352c
Finished the lesu
2015-06-14 16:42:03 +01:00
Gig
0ac115b0e1
Added config for ChargeHud
2015-06-14 13:45:41 +01:00
Gig
e2ae947e2c
More work on ChargeHud now shows current charge
...
Added Color enum from Talismans 2 will be used for hud soonTM
2015-06-14 12:34:47 +01:00
modmuss50
63fa58eb24
Added average eu change to the aesu.
2015-06-14 12:15:24 +01:00
modmuss50
755c64369a
Fixed fluid syncing issues, fixed liquid item dropping when block broken
2015-06-14 11:58:56 +01:00
modmuss50
f5bd04db3c
Fixes the layout of the aesu gui
2015-06-14 11:37:42 +01:00
Universal
600293b0e8
Made destructopack work
...
Missed two files...
2015-06-14 01:21:03 +02:00
Universal
8a2119d5d2
Made destructopack work
2015-06-14 01:13:09 +02:00
Gig
89f24a0c4d
Start on charge hud
2015-06-11 23:23:14 +01:00
modmuss50
944ac7492e
Fixed some issues with the AESU, Added gui text to it
2015-06-10 16:12:16 +01:00
modmuss50
9b1093c22c
Added basic aesu controls, just need to finish the gui :)
2015-06-10 13:52:54 +01:00
modmuss50
23bf14b37d
Clean the sawmill gui a bit, and remove debug code
2015-06-07 18:58:31 +01:00
modmuss50
3605fa7f66
Merge branch 'master' of https://github.com/TechReborn/TechReborn
2015-06-07 14:21:25 +01:00
joflashstudios
7cfaac1f61
Added Digital Chest, Computer Monitor
2015-06-06 22:11:13 -04:00
modmuss50
c6dc2e2810
Clean up of code
2015-06-06 22:51:06 +01:00
modmuss50
56619a0ac4
Fixed grinder not syncing, started work on the nei handler for it, will add the fluid for it in a bit
2015-06-06 08:01:24 +01:00
joflashstudios
48dd12aa5a
Added gas turbine. Still missing recipe and some config elements.
2015-06-05 16:24:52 -04:00
joflashstudios
81273e33ad
Added Semifluid generator. Suffers from issue #19 as well.
2015-06-04 23:34:04 -04:00
modmuss50
1e656b26e7
Now sync to the client side tile, not the container.
2015-05-31 10:45:08 +01:00
modmuss50
6185bcd694
added speedMultiplier to the crafter
2015-05-30 11:27:15 +01:00
modmuss50
edabf79b1e
Moved all the machines to the new way of handling the packets
2015-05-30 11:14:00 +01:00
modmuss50
7dced713ba
Some small changes
2015-05-29 17:13:03 +01:00
modmuss50
c5e73c6fc3
Moved over to the vanilla packet system.
2015-05-29 17:00:17 +01:00
modmuss50
0298621cb9
More work on the syncing issues, should be all fixed :)
2015-05-22 21:15:19 +01:00
Tntrololol
cdf8f3e0a3
Added GUI elements to the Industrial Grinder
2015-05-21 18:04:34 -05:00
Tntrololol
2278e2ab3e
Added GUI progress bar to the Chemical Reactor
2015-05-20 17:34:41 -05:00
Tntrololol
4bd43b861c
Added GUI progress bar to the Industrial Centrifuge
2015-05-20 16:43:46 -05:00
Gig
1f9600b33c
Organized imports
...
Changed centrifuge to new recipe system
2015-05-19 23:00:36 +01:00
Gig
ce4312a578
Upgrade slots for more machines
2015-05-17 19:45:12 +01:00
Gig
f9074e5b37
Added battery and upgrade slots to chemical reactor
2015-05-15 17:46:03 +01:00
Gig
83259b0615
Fixed Chemical Reactor gui name
2015-05-15 17:37:33 +01:00
Tntrololol
5a57dc5817
Merge remote-tracking branch 'origin/master'
2015-05-12 13:26:35 -05:00
Tntrololol
65dd53c6ec
Added machine GUI progress bars
2015-05-12 13:26:23 -05:00
Gig
bf49bd2136
Added upgrade slots to AssemblingMachine
2015-05-12 16:05:15 +01:00
Gig
13957467a1
Added battery slot and upgrade slots to alloy smelter
2015-05-12 15:58:20 +01:00
Gig
a23243cd02
Added ChemicalReactor
2015-05-12 00:17:17 +01:00
Gig
f84d9edc06
Finish plate cutting machine
2015-05-11 23:50:49 +01:00
Gig
2ab94e6030
Fixed Lathe recipe handler
2015-05-11 23:44:26 +01:00