maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1954 commits 1 branch 0 tags 80 MiB
Commit graph

395 commits

Author SHA1 Message Date
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
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
Modmuss50
19d269b1de Fixes #271 2015-11-16 11:17:36 +00:00
modmuss50
16f1a8de17 Charge bench recode. 2015-11-13 19:00:17 +00:00
gigabit101
cc2b6a8df3 All machines can now be powered with batteries 2015-11-13 16:40:01 +00:00
gigabit101
0ebf0c95dd more charge slots 2015-11-13 16:29:35 +00:00
gigabit101
a74910e763 Some work on charge slots 2015-11-13 16:08:50 +00:00
Modmuss50
2331e3c35d Fixes #255 and fixes #258 2015-11-12 21:38:11 +00:00
Modmuss50
61a600713a Charge bench now supports higher teir items. 2015-11-12 21:28:49 +00:00
gigabit101
da631dd25e Fixed Isidedness of Centrifuge closes #262 2015-11-12 21:01:36 +00:00
gigabit101
320d06e39e Fixed Digital Chest not counting the ItemStack in output slot 2015-11-12 20:22:41 +00:00
gigabit101
d9654782fe Fixed stack issue with Quantum/Digital Chest 2015-11-12 20:12:15 +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
c120c37723 Fixes #250 2015-11-11 17:12:59 +00:00
Modmuss50
842fa421ae Fixes #243 2015-11-11 17:00:18 +00:00
Modmuss50
e4760e559b Fixes #249 2015-11-11 15:30:03 +00:00
Modmuss50
47a466ef21 Some fixes for #242 2015-11-11 15:24:13 +00:00
Modmuss50
7135075ac6 Removed power indicator on sawmill 2015-11-11 15:17:24 +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
e93b29545e You saw nothing :) 
Just some debug code
 2015-11-01 17:09:46 +00: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
227d5fe19b Fixes #214 2015-11-01 14:38:47 +00:00
modmuss50
50fa2e8a1d Fixes #194 2015-10-22 18:19:05 +01:00
MrBretzel
94b0123a3b Fixed #192 2015-10-22 13:34:11 +02:00
Modmuss50
2d3c6a8dec Charge bench now uses new power system, also uses old one 2015-10-14 21:42:45 +01:00
modmuss50
13383bd2a9 Should fix #186 2015-10-10 16:42:21 +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
8a494a392c Fixes #172 2015-10-08 08:24:48 +01:00
Modmuss50
7d052a3292 Removed last ic2 energy class 2015-10-07 08:20:45 +01:00
Modmuss50
3a9c469965 Fixes #171 2015-10-07 08:19:39 +01:00
Modmuss50
081f16a533 Removed Farm 2015-09-23 18:58:46 +01:00
modmuss50
47a8ccadcb added backwards compatibility for block rotation 2015-09-19 09:38:19 +01:00
modmuss50
148715111f Renamed TileMeta to TileRotation 2015-09-19 09:31:24 +01:00
Modmuss50
11fd755619 Fixed issues with the tank not syncing on the disel genertaor 2015-09-10 19:39:00 +01:00
Modmuss50
2cf90af757 Fixed #140 2015-09-10 17:41:59 +01:00
modmuss50
8aafd118f5 Added fluid power manager, imports from forestry and bc 2015-09-08 18:39:59 +01:00
gigabit101
61120ed30b Added Ae2 and Logistic pipe support to Quantum Chest 2015-09-07 20:48:35 +01:00
Modmuss50
fe11409b4e Fixed a load of crashes becuase of the new rotation system. Fixed powered tiles 2015-09-05 11:44:41 +01:00
Modmuss50
d3e860edb2 Inital port to tile based meta 2015-09-05 09:17:58 +01:00
modmuss50
d4c663ae72 fixes #116 2015-08-26 09:55:04 +01:00
modmuss50
ccb028a202 Tweaked thermal generator, closes #100 2015-08-16 12:17:02 +01:00
modmuss50
6d46a03e5d Fixes #104 and #105 2015-08-13 12:47:55 +01:00
modmuss50
c63e9577fe Fixed massive multi blocks 2015-08-10 22:27:40 +01:00
modmuss50
2ff03573d9 Added logic to alloy furnace 2015-08-10 19:28:52 +01:00
modmuss50
fb33dda932 Changes the way heat is calculated. 2015-08-10 14:32:01 +01:00
modmuss50
e0ab0af822 Reformatted all the code using the default intelji formatting options. 2015-08-09 11:05:32 +01:00
modmuss50
219aa69860 Fixed the IDSUManager crashing on startup and resetting the power values. 2015-07-27 19:18:42 +01:00
modmuss50
5927eaca4c Recoded idsu, closes #81 2015-07-26 16:01:27 +01:00
modmuss50
e8bbbcc7c3 Some changes to the way rf is handled. 2015-07-25 17:55:03 +01:00
gigabit101
fb3855a078 closes #87 2015-07-24 23:18:30 +01:00
gigabit101
2d16b194e8 this might have been a issue at some point 2015-07-24 22:30:23 +01:00
gigabit101
bac2cdcbc6 closes #55 2015-07-24 22:29:00 +01:00
modmuss50
8725c5932d It now gets to the main menu without ic2 :) o/ Next I need to fix the powered items. 2015-07-23 16:19:07 +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
984b502ded fixes #85 , Fixes issues with RF output 2015-07-23 10:13:37 +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
modmuss50
663b5f2f75 Fixed some issues with the Industrial Electrolyzer 2015-07-20 15:38:36 +01:00
modmuss50
462aa20710 Fixed the BlastFurnace 2015-07-20 15:19:23 +01:00
modmuss50
d2b2f34d64 Some tweaks to the farm 2015-07-13 21:31:11 +01:00
modmuss50
ef5d81d8e2 Some more work on the farm 2015-07-13 16:24:50 +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
modmuss50
ab384b661a Fixed lesu issue, temp remove rf output 2015-07-03 17:12:31 +01:00
modmuss50
10846270c5 Matterfab now needs scrap 2015-07-03 16:38:31 +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
a71b399765 Moved the lesu to the new system, looks like its stripping every thing ;'( 2015-07-01 20:34:22 +01:00
modmuss50
5b06a20351 Added ASM Method and Field stripper, more work on own power net 2015-07-01 16:41:40 +01:00
Gig
926bcb9f8b more little things 2015-06-30 00:08:40 +01:00
Gig
e216bc3643 Some changes to Isided on for the ChargeBench 2015-06-29 23:43:00 +01:00
Gig
40a97145dc fixed a important check 2015-06-29 23:18:21 +01:00
modmuss50
2e7f506115 fixes #66 2015-06-29 19:10:26 +01:00
Gig
a063e13612 It works!!! 
Charge bench now working needs a texture and recipe
 2015-06-29 18:42:20 +01:00
Gig
bfe0d57bc7 Started on ChargeBench only slot 0 works atm 2015-06-29 18:03:40 +01:00
Gig
3c4439ec5c Sawmill now needs multiblock 2015-06-27 16:10:43 +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
ddb4b5cb20 Moved blast furnace recipes over to new crafter still needs to get heat 2015-06-25 20:17:14 +01:00
Gig
8da3e8323a Grinder now requires multiblock 2015-06-25 16:40:39 +01:00
Gig
7a4ac3e610 ImplosionCompressor now requires multiblock 2015-06-25 16:33:56 +01:00
modmuss50
f92f67232a some improvements to tick time 2015-06-25 08:28:29 +01:00
modmuss50
f9a99feee0 fixes #43 and fixes #48 2015-06-25 07:55:29 +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
e660463bae Some work no the mass fab 2015-06-22 11:32:30 +01:00
modmuss50
43da219936 Some clean up of some code 2015-06-21 14:17:47 +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
modmuss50
345fa8e4a0 Fixed average eu/tick out 2015-06-19 18:38:08 +01:00
modmuss50
9d16b13d6e initial work on making it work, now to fix the broken gui 2015-06-18 18:34:39 +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
2bed98e6f0 Added basic test cases for the IDSU manager, it looks like it works :) 2015-06-15 21:18:12 +01:00
modmuss50
97e8492801 Fixed java 6 support 2015-06-15 20:19:21 +01:00
modmuss50
30ad6dd52f Cleaned up, fixed spelling issues 2015-06-15 20:12:02 +01:00
modmuss50
b0fdd92b8d Initial work on IDSU manager 2015-06-15 20:09:16 +01:00
Tntrololol
083696280c Some GUI fixes 2015-06-14 13:34:52 -05: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
modmuss50
2ded7e0121 Added lesu logic. updated fmp to allow extra utils to run 2015-06-14 15:58:49 +01:00
modmuss50
51c91aaccb Added lesu storage block counting 2015-06-14 13:35:36 +01:00
modmuss50
af9e9e535a Now stores eu when broken with a wrench. Added empty and full ones to creative tab. 2015-06-14 12:35:28 +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
6deb0b1d32 Improved the way we handle other mods 2015-06-12 18:40:08 +01:00
Tntrololol
206f967d63 Updated the Industrial Sawmill to include a FluidTank and allow FluidStack input (someone make sure I did it right) 2015-06-10 23:48:15 -05:00
modmuss50
65fe6dc405 Only show this when debuging 2015-06-10 18:36:07 +01:00
modmuss50
944ac7492e Fixed some issues with the AESU, Added gui text to it 2015-06-10 16:12:16 +01:00
modmuss50
81a5f3fc76 Fix output sides 2015-06-10 13:54:46 +01:00
modmuss50
9b1093c22c Added basic aesu controls, just need to finish the gui :) 2015-06-10 13:52:54 +01:00
modmuss50
6826cfe4be added unrest upgradeHandler 2015-06-09 11:24:15 +01:00
Gig
ff61878bfb Added isided for PlateCuttingMachine 2015-06-08 23:38:15 +01:00
Gig
b4219f25ed Added Isided for MatterFabricator 2015-06-08 23:36:11 +01:00
Gig
d0ed6c5a47 Added ISided for Lathe 2015-06-08 23:34:12 +01:00
Gig
98329b2d01 Added Isided to IndustrialSawmill 2015-06-08 23:32:46 +01:00
Gig
e569d625f8 Added Isided for IndustrialElectrolyzer (CANT TEST) 2015-06-08 23:30:42 +01:00