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

703 commits

Author SHA1 Message Date
joflashstudios
238901323c Some hud tweaks 2015-06-19 20:03:31 -04:00
modmuss50
8058867eb1 Deprecated the item cells class, it now returns the ic2 version instead of the tr one for recipes 2015-06-19 19:01:38 +01:00
modmuss50
345fa8e4a0 Fixed average eu/tick out 2015-06-19 18:38:08 +01:00
modmuss50
d30c251b8f fixes #40 2015-06-19 18:13:05 +01:00
modmuss50
45783b55f1 Fixes #38 on new ic2's 2015-06-19 18:07:15 +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
Gig
52deb162ff Fixes closes #39 2015-06-19 00:56:07 +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
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
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
joflashstudios
54904b223f Fixed oredrops 
Fixes #36
 2015-06-17 00:27:44 -04:00
modmuss50
70fb58f704 work on the gui list 2015-06-16 13:38:46 +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
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
joflashstudios
2b17e7e949 Missed some AOBD lines 2015-06-14 18:03:32 -04:00
joflashstudios
9359022c83 Added fix for AOBD compatibility 2015-06-14 17:56:15 -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
3b6cd66cb7 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-06-14 19:34:20 +01:00
Gig
1b20c3fcb0 Hud color changes depending on current charge 2015-06-14 19:34:14 +01:00
modmuss50
4ea5c0f8b0 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-06-14 19:11:42 +01:00
modmuss50
be296c69aa Fixed syncing items 2015-06-14 19:11:26 +01:00
Gig
22d018efb3 World gen tweeks 2015-06-14 18:31:49 +01:00
Gig
f5aecc07cc Fixed derpy textures 2015-06-14 18:29:27 +01:00
Gig
0b43eca49a Removed Gravity Chestplate not needed in this mod anymore 2015-06-14 17:11:18 +01:00
Gig
28dbcb8a16 Removed Debug Recipes 2015-06-14 17:04:57 +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
modmuss50
783765676b Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-06-14 15:59:03 +01:00
modmuss50
2ded7e0121 Added lesu logic. updated fmp to allow extra utils to run 2015-06-14 15:58:49 +01:00
Gig
0ac115b0e1 Added config for ChargeHud 2015-06-14 13:45:41 +01:00
modmuss50
afdbe69d18 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-06-14 13:35:47 +01:00
modmuss50
51c91aaccb Added lesu storage block counting 2015-06-14 13:35:36 +01:00
Gig
b0b2f4e6eb Small changes to RockCutter 2015-06-14 12:56:08 +01:00
modmuss50
81f75abf22 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-06-14 12:35:41 +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
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
Modmuss50
870958cd68 Merge pull request #32 from UniversalLP/master 
Added destructopack gui
 2015-06-14 10:48:03 +01:00
Tntrololol
1e657c9e04 Added Industrial Sawmill Recipes for Forestry logs 2015-06-13 18:31:46 -05: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
Tntrololol
a9ea898cab Added Industrial Sawmill Recipes for Thaumcraft magical logs 2015-06-13 15:59:55 -05:00
Tntrololol
e3338cf40f Fixed existing Sawmill recipes not outputing empty cells 2015-06-13 14:56:15 -05:00
modmuss50
62b5f2f046 removed unused inport to fix crash 2015-06-13 07:47:24 +01:00
modmuss50
7308507a74 fixes #31 , Fixes crash without bop or natura installed, fixes npe with no plup item, adds basic fluid gui support to the nei handler, fixes build craft 6 not working 2015-06-13 07:45:12 +01:00
Tntrololol
fbde3bcaf0 Added Industrial Sawmill Recipes for Biomes O Plenty logs 2015-06-12 23:46:03 -05:00
Tntrololol
875ac18f0b Updated Ore Dictionary registration to use item/block helpers 2015-06-12 21:35:57 -05:00
Tntrololol
496d8c4ba2 Fixed Industrial Sawmill recipe constructor (fixes compiler error) 2015-06-12 21:30:35 -05:00
Tntrololol
a6fcd15082 Added item for saw dust 2015-06-12 18:49:32 -05:00
Tntrololol
2116e4eb39 Added Industrial Sawmill Recipes for Natura logs 2015-06-12 18:33:07 -05:00
modmuss50
6deb0b1d32 Improved the way we handle other mods 2015-06-12 18:40:08 +01:00
Gig
89f24a0c4d Start on charge hud 2015-06-11 23:23:14 +01:00
modmuss50
0ea07a6a1a added way to not use ore dic 2015-06-11 21:35:05 +01:00
Tntrololol
df7199d113 Gave the Industrial Sawmill a front texture 2015-06-11 15:06:21 -05:00
Gig
5109c6b53b Fixed Nei Handler for the Grinder 2015-06-11 17:45:43 +01:00
joflashstudios
41a516939f Removed broken test recipe for sawmill 2015-06-11 01:57:09 -04: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
Tntrololol
0de7ae5d90 Renamed some tiles 2015-06-10 14:52:07 -05:00
modmuss50
871a6a6a9d Fixed as not outputting until hit with a wrench 2015-06-10 20:48:17 +01: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
92b95b9ff0 added some fixes, added documentation 2015-06-09 13:29:17 +01:00
modmuss50
6826cfe4be added unrest upgradeHandler 2015-06-09 11:24:15 +01:00
Tntrololol
776fd328c3 Added Chemical Reactor Recipes 2015-06-08 22:13:14 -05:00
Tntrololol
dd181dca2f Merge remote-tracking branch 'origin/master' 2015-06-08 21:01:55 -05:00
Tntrololol
0bd2b68d83 Added Implosion Compressor Recipes 2015-06-08 21:01:43 -05: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
Gig
1fa1806c15 Added Isided for ImplosionCompressor 2015-06-08 23:27:44 +01:00
Gig
99d237f26e Fixed Isided on Grinder 2015-06-08 23:27:31 +01:00
Gig
77c4ea4820 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-06-08 23:22:10 +01:00
Gig
c8da0db5f5 Added Isided for Grinder 2015-06-08 23:22:06 +01:00
Tntrololol
96b3278347 Merge remote-tracking branch 'origin/master' 2015-06-08 17:15:01 -05:00
Tntrololol
f5ca92313f Changed standard machine recipes to use item/block helpers 2015-06-08 17:14:43 -05:00
Gig
d95ccc6cc2 Added Isided to ChemicalReactor 2015-06-08 23:14:18 +01:00
Gig
4e9546431d Added Isided to Centrifuge 
Fixed Isided on other machines
 2015-06-08 23:11:48 +01:00
Gig
f005ba2ec7 Added Isided to Blast Furnace 2015-06-08 22:39:07 +01:00
Gig
99aa1f8811 Added Isided to Assembling machine 2015-06-08 22:32:19 +01:00
Gig
3c10c0f08f Added ISidedInv to alloy Smelter 2015-06-08 22:12:11 +01:00
Gig
4f800c8a83 Added basic tile for metalShelf 2015-06-08 20:51:08 +01:00
modmuss50
b56487b680 This should fix bc 6 compatibility 
Can some one test please.
 2015-06-08 18:26:22 +01:00
modmuss50
a94085229d Moved OreDrop 
With a small bit of work we could make an api to get the config values,
then this could go in the api
 2015-06-08 17:44:29 +01:00
modmuss50
2ef2ff997f updated to build craft 7.0.8 2015-06-08 17:41:41 +01:00
joflashstudios
02fce02d7b Said goodbye to RecipeHanderer 
A bunch of ModRecipes fixes
 2015-06-08 10:45:21 -04:00
joflashstudios
ffc4d5f9c3 Cleaned up some imports 2015-06-08 10:14:50 -04:00
joflashstudios
e2d0bd4a82 Removed the config object 
It's not getting used. Those configs are static members.
 2015-06-08 02:56:20 -04:00
joflashstudios
a2c0e4d091 Fixed some indentation I missed 2015-06-08 02:54:17 -04:00
joflashstudios
43204cb234 Some major recipe code cleanup 
Varargs exists for a reason, you know ( ͠° ͟ʖ ͡°)
Also, changed the expensive recipes so that they actually behaved according to the configs.
 2015-06-08 02:50:36 -04:00
joflashstudios
86726d57c4 Fixed indention. IntelliJ can be obnoxious. 2015-06-08 01:45:49 -04:00
joflashstudios
f082fe5b2a Add the rest of the ores to the OreDrop API 2015-06-08 01:41:44 -04:00
joflashstudios
00d2f5f8fd OreDrop fixes 
Fixes 2 issues.

1/100 block breaks, a non-fortune tool grants an extra item

Bug that breaks drops if the base count is > 1
 2015-06-08 01:41:15 -04:00
joflashstudios
ace69fc5be Tweaked OreDrop constructor 
baseChance is now exposed to the rest of the world as a double, since it was just an error waiting to happen when somebody enters the % chance as stack size or vice versa.
 2015-06-08 01:06:56 -04:00
joflashstudios
999567e6df We no longer need to distinguish between primary and secondary, since we are now using [ArrayList<ItemStack> getDrops()]. 
We could possibly just get rid of the class altogether, but it keeps BlockOre's code significantly cleaner.
 2015-06-08 00:46:51 -04:00
joflashstudios
8ca4950b02 Added ruby and sapphire ore drops. 2015-06-08 00:31:28 -04:00
Tntrololol
d330f28024 Changed IC2 specific machine recipes to use item/block helpers 2015-06-07 23:24:34 -05:00
joflashstudios
601812a10c Added OreDrop API 2015-06-07 23:55:58 -04:00
joflashstudios
c01ae43435 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-06-07 17:21:10 -04:00
joflashstudios
70f2d9f108 Added recipes for: 
Tungsten grinding heads
Matterfacbricator
Shaped energy flow circuit recipe
Superconductor
Supercondensator
Iridium alloy ingot
Diamond saw blade
 2015-06-07 17:20:49 -04:00
Gig
459672ac2c Removed a load of waila support 2015-06-07 21:01:29 +01:00
joflashstudios
d3c2929807 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-06-07 15:55:54 -04:00
joflashstudios
2f59ca1b84 Added computercube and lapotronic energy orb 2015-06-07 15:55:23 -04:00
Gig
f240604c4a Fixed Derp.... 2015-06-07 20:47:44 +01:00
Gig
a8962929cc Fixed small derp 2015-06-07 20:45:53 +01:00
Gig
b1cbec9e63 Added Grinder on textures 2015-06-07 20:41:06 +01:00
Gig
958dbbd9c4 Round and round it goes 2015-06-07 20:23:49 +01:00
Gig
70cd363656 On Icons for a load of machines 2015-06-07 19:39:21 +01:00
modmuss50
a1ccb7202e Added timer to the recipes. 2015-06-07 19:37:56 +01:00
modmuss50
8187708e03 Fixed on/off textures when power runs out 2015-06-07 19:22:17 +01:00
modmuss50
439a877ace Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-06-07 19:11:26 +01:00
modmuss50
8122d25877 Added wrench rotation to the aesu. 2015-06-07 19:11:08 +01:00
Tntrololol
d9e219054e Merge remote-tracking branch 'origin/master' 2015-06-07 13:06:08 -05:00
Tntrololol
af65c885b1 Added proper textures to heat generator 2015-06-07 13:05:53 -05:00
modmuss50
23bf14b37d Clean the sawmill gui a bit, and remove debug code 2015-06-07 18:58:31 +01:00
modmuss50
c401f614d3 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-06-07 18:22:43 +01:00
modmuss50
950f556770 Fixed issue when not enough imports are present. 2015-06-07 18:22:31 +01:00
Gig
bf2054d0a7 Fixed Import 2015-06-07 18:17:39 +01:00
modmuss50
089f5500e6 removed unneeded debug code 2015-06-07 14:27:19 +01:00
modmuss50
3605fa7f66 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-06-07 14:21:25 +01:00
modmuss50
06c21d2668 this was the issue all along 
This would be the easy fix to my last commit.
 2015-06-07 11:11:07 +01:00
modmuss50
efba3f247d added IInventory to all machines 2015-06-07 09:38:12 +01:00
modmuss50
1ac6f592f8 Fixes #25 2015-06-07 09:31:58 +01:00
modmuss50
94803e88f3 attempt at fixing the item stack size issue 2015-06-07 09:21:37 +01:00
joflashstudios
92af5a1537 Fixed Digital Chest texture 2015-06-07 01:26:37 -04:00
joflashstudios
123c12ae45 Changed QuantumChest, QuantumTank, and DigitalChest to use readability helpers. 2015-06-07 01:02:45 -04:00
joflashstudios
26e71488dd Revert "Changed QuantumChest, QuantumTank, and DigitalChest to use readability helpers." 
This reverts commit d9494c31fb.
 2015-06-07 00:45:15 -04:00
joflashstudios
d9494c31fb Changed QuantumChest, QuantumTank, and DigitalChest to use readability helpers. 2015-06-07 00:41:20 -04:00
joflashstudios
9fa01eaee2 Added helpers for the rest of the item types 2015-06-07 00:36:37 -04:00
joflashstudios
b950105578 Created BlockOre helpers to make recipes more readable. 
These works the same as the ItemParts helpers from e00ba942f8
 2015-06-07 00:13:41 -04:00