modmuss50
|
11e680500f
|
Fixed crash when RF is disabled
|
2015-08-16 11:50:25 +01:00 |
|
modmuss50
|
2b979f4c4c
|
Merge branch 'master' of https://github.com/TechReborn/TechReborn
|
2015-08-16 11:19:36 +01:00 |
|
modmuss50
|
00dad58c6d
|
Fixed some recipes
|
2015-08-16 11:19:25 +01:00 |
|
gigabit101
|
d17276e96d
|
Added config's to disable mod integration closes #111
|
2015-08-15 23:31:02 +01:00 |
|
modmuss50
|
44c5037b28
|
Added config settings for power net, closes #112
|
2015-08-15 17:03:28 +01:00 |
|
modmuss50
|
8c421d20dd
|
Some small tweaks to the cloaking device
|
2015-08-14 00:28:28 +01:00 |
|
modmuss50
|
65f0bb2175
|
Fixed last PR
|
2015-08-14 00:09:44 +01:00 |
|
primetoxinz
|
87877c647a
|
remove random import
|
2015-08-13 19:06:11 -04:00 |
|
primetoxinz
|
1ac0897c0e
|
Fix invisibility potions and cloaking device
|
2015-08-13 19:05:10 -04:00 |
|
primetoxinz
|
199bbf28b6
|
Finished Cloaking Device
|
2015-08-13 18:46:01 -04: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 |
|
gigabit101
|
59590e6f76
|
Added back buttons
|
2015-08-10 22:19:15 +01:00 |
|
gigabit101
|
cc9c496f6e
|
Small changes to PDA
|
2015-08-10 22:04:54 +01:00 |
|
modmuss50
|
fe049cc160
|
Added Blocks and items to the api
|
2015-08-10 19:41:28 +01:00 |
|
modmuss50
|
2ff03573d9
|
Added logic to alloy furnace
|
2015-08-10 19:28:52 +01:00 |
|
gigabit101
|
6a20c0f160
|
Merge branch 'master' of https://github.com/TechReborn/TechReborn
|
2015-08-10 18:30:34 +01:00 |
|
gigabit101
|
f58fbfe0e8
|
Added alot of work on the PDA still {WIP}
|
2015-08-10 18:30:19 +01:00 |
|
modmuss50
|
ab880fba98
|
Merge branch 'master' of https://github.com/TechReborn/TechReborn
|
2015-08-10 14:32:10 +01:00 |
|
modmuss50
|
fb33dda932
|
Changes the way heat is calculated.
|
2015-08-10 14:32:01 +01:00 |
|
gigabit101
|
d41f7470b9
|
fixed localization for sawmill gui
|
2015-08-09 18:35:35 +01:00 |
|
modmuss50
|
404bbf6797
|
Fixed #101
|
2015-08-09 16:45:17 +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
|
a6431776a8
|
Fixed power disappearing
|
2015-08-05 19:32:01 +01:00 |
|
modmuss50
|
4404122002
|
Fixes #93, use energy was inverted, canUseEnergy was always returning true
|
2015-08-05 18:21:56 +01:00 |
|
modmuss50
|
56c747bb93
|
Should help with the storage block recipes
|
2015-08-05 15:51:35 +01:00 |
|
modmuss50
|
9e346e6061
|
Added machine parts, added some recipes. Fixes #92
|
2015-08-05 15:35:06 +01:00 |
|
modmuss50
|
79f14f8be6
|
Fixes Crash without CodeChickenLib installed closes #94
|
2015-08-05 15:10:29 +01:00 |
|
gigabit101
|
4c2c69f84e
|
Added cloaking device {WIP}
|
2015-08-04 21:12:27 +01:00 |
|
gigabit101
|
8a4aea90aa
|
Clean up for Dungeon loot code
|
2015-08-04 21:12:02 +01:00 |
|
gigabit101
|
7905573e23
|
Fixed Quantum chests and tanks not having a hardness
|
2015-08-04 20:50:58 +01:00 |
|
modmuss50
|
1d6504c7ba
|
Revert "Small re-factor to the RecipeRemover"
This reverts commit 9c94b045b3.
|
2015-08-04 10:31:41 +01:00 |
|
modmuss50
|
9c94b045b3
|
Small re-factor to the RecipeRemover
|
2015-07-27 19:40:00 +01:00 |
|
modmuss50
|
b9d880abe2
|
Fixed the silk touch issue again
|
2015-07-27 19:28:52 +01:00 |
|
modmuss50
|
219aa69860
|
Fixed the IDSUManager crashing on startup and resetting the power values.
|
2015-07-27 19:18:42 +01:00 |
|
modmuss50
|
3db7271fd1
|
Added recipe list exporting to json
|
2015-07-27 14:13:22 +01:00 |
|
modmuss50
|
b1682a64bd
|
Fixes #90
|
2015-07-26 16:13: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
|
d8e8f45993
|
Fixed incorrect rf calculation values
|
2015-07-26 14:46:56 +01:00 |
|
modmuss50
|
e8bbbcc7c3
|
Some changes to the way rf is handled.
|
2015-07-25 17:55:03 +01:00 |
|
modmuss50
|
26f63e04f7
|
some small changes
|
2015-07-25 17:11:03 +01:00 |
|
modmuss50
|
c869e1656c
|
Removed ic2 core dependency, should now only need to use the api
|
2015-07-25 16:37:11 +01:00 |
|
modmuss50
|
07c9ee97d4
|
Added test recipe for blast furnace
|
2015-07-25 15:32:20 +01:00 |
|
modmuss50
|
aff8c26c49
|
Fixes energy gui scaling
|
2015-07-25 15:16:22 +01:00 |
|
modmuss50
|
466f50b232
|
fixes #44
|
2015-07-25 15:13:52 +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 |
|
gigabit101
|
5636dc373f
|
closes #79
|
2015-07-24 21:54:18 +01:00 |
|
modmuss50
|
ef11f111ed
|
Started work on a way to find duplicate items
|
2015-07-23 16:57:06 +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
|
277e5e5e45
|
Fix incorrect EU-RF conversion
|
2015-07-23 13:07: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 |
|
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 |
|
modmuss50
|
bb98d76eea
|
Fixed incorrect storage block recipes
|
2015-07-23 09:30:38 +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
|
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
|
29398d50dd
|
Added Farm inventory cable
|
2015-07-14 17:18:00 +01:00 |
|
modmuss50
|
b6807d249d
|
Some major tweaks to the part system, broken old cables!
|
2015-07-14 16:45:45 +01:00 |
|
modmuss50
|
d2b2f34d64
|
Some tweaks to the farm
|
2015-07-13 21:31:11 +01:00 |
|
modmuss50
|
fadba8db41
|
Even more work on the farm
|
2015-07-13 21:21:30 +01:00 |
|
modmuss50
|
5d574e0540
|
Some more work on the tree farm
|
2015-07-13 20:54:32 +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
|
be33bdc148
|
Fixes #80
|
2015-07-12 16:51:14 +01:00 |
|
modmuss50
|
1a3cd0c54e
|
fixes #78
|
2015-07-11 18:19:08 +01:00 |
|
modmuss50
|
a48dab6dfa
|
Fixed ruby to steel
|
2015-07-11 18:12:06 +01:00 |
|
modmuss50
|
fdc23c5ae9
|
Added support for EE3-Compataibilty
|
2015-07-06 20:33:50 +01:00 |
|
gigabit101
|
91c9a28796
|
Removed ruby to ruby dust recipe close #69
|
2015-07-06 16:52:12 +01:00 |
|
gigabit101
|
a07af2d70d
|
moved battery slot on Centrifuge to correct position
|
2015-07-06 16:49:11 +01:00 |
|
gigabit101
|
179ae2ca42
|
Now use oredict for plateIridium closes #74
|
2015-07-06 16:41:17 +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 |
|
modmuss50
|
0a82e61ebd
|
Some tweaks to minetweaker support
|
2015-07-03 08:40:38 +01:00 |
|
gigabit101
|
26eff9bcbf
|
Removed fluid tank from IndustrialElectrolyzer closes #58
|
2015-07-02 23:39:36 +01:00 |
|
modmuss50
|
b7a9824cd3
|
Added config setting for eu/rf value
|
2015-07-02 23:35:10 +01:00 |
|
modmuss50
|
a85d917873
|
Added minetweaker support to the alloy furnace.
I have no idea on how minetweaker works so could some one help me test?
for #70
|
2015-07-02 20:45:05 +01:00 |
|
modmuss50
|
85bfa95c1c
|
Some basic work for #70
|
2015-07-02 20:23:01 +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
|
d795d81fba
|
added emc value for lesu
|
2015-07-02 17:39:04 +01:00 |
|
modmuss50
|
a5505ccd0c
|
Fixed RF not outputting
|
2015-07-02 13:16:47 +01:00 |
|
modmuss50
|
dcc437c1fe
|
Cleaned up some code
|
2015-07-02 11:14:21 +01:00 |
|
modmuss50
|
f657270b34
|
Fixed ClassTransformation
|
2015-07-02 11:07:52 +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
|
30ff429b6a
|
Moved our energy net to doubles, should be all done(now need to test), added eu to rf conversion
|
2015-07-01 17:53:03 +01:00 |
|
modmuss50
|
78faca7a19
|
Implemented the other apis, now need to implement our own
|
2015-07-01 17:23:29 +01:00 |
|
modmuss50
|
f81c5c4f8d
|
Clean up of the striping code
|
2015-07-01 16:49:50 +01:00 |
|
modmuss50
|
5b06a20351
|
Added ASM Method and Field stripper, more work on own power net
|
2015-07-01 16:41:40 +01:00 |
|
modmuss50
|
4fae706242
|
Started work on new power api
|
2015-07-01 12:56:45 +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
|
6c61829ddc
|
Fixed cable drops
|
2015-06-29 20:19:56 +01:00 |
|
modmuss50
|
963c009648
|
Fixed parts not loading with the world
|
2015-06-29 20:04:17 +01:00 |
|
modmuss50
|
664252bc96
|
fixes #64
|
2015-06-29 19:18:26 +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
|
f2a67a60d4
|
Added localization to fluids closes #56
|
2015-06-29 15:53:54 +01:00 |
|
Gig
|
c2deb74a81
|
Fixed recipe button positions on all machines closes #57
|
2015-06-29 15:41:04 +01:00 |
|
Gig
|
15d3ad325f
|
bronze now has the correct emc value closes #59
|
2015-06-29 15:02:19 +01:00 |
|
TheQuantumGeneral
|
d1b41c27aa
|
Update ModRecipes.java
fixing chlorine being referenced as a dust instead of a cell in electrolyser recipe
|
2015-06-29 19:08:23 +10: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 |
|
modmuss50
|
d53a2aeef1
|
Added rendering back, fixed lag issues with cables
|
2015-06-28 19:02:31 +01:00 |
|
joflashstudios
|
acb06afd1f
|
Missed some temporary code
|
2015-06-27 18:13:51 -04:00 |
|
joflashstudios
|
40c01c18a0
|
Added more Electrolyzer recipes
I can't get the sand --> silicone recipe to take more than 1 block of sand. Help would be appreciated.
|
2015-06-27 18:12:36 -04:00 |
|
modmuss50
|
2a95225c9c
|
Added rest of base values
|
2015-06-27 22:35:23 +01:00 |
|
modmuss50
|
8a3d173007
|
Added some new values
|
2015-06-27 22:04:52 +01:00 |
|
modmuss50
|
a393964109
|
Disabled cable rendering
|
2015-06-27 21:52:29 +01:00 |
|
joflashstudios
|
f2c6959949
|
Added sawmill recipe
Fixes #61
|
2015-06-27 14:27:36 -04:00 |
|
joflashstudios
|
5cc58bf2c5
|
Added more Electrolyzer Recipes
The bone meal --> calcium cell one still isn't working right. @modmuss50, would you be willing to take a look at it sometime?
|
2015-06-27 14:00:53 -04: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
|
aa76eeb6b0
|
Added CATEGORY_EMC to config
|
2015-06-27 15:59:50 +01:00 |
|
Gig
|
d1196d0a7c
|
Removed Recipes button and moved to progress bar
|
2015-06-27 10:01:39 +01:00 |
|
modmuss50
|
6f08a56df2
|
Added some values for copper and tin, added support for ic2 machines and crafting
|
2015-06-27 09:03:09 +01:00 |
|
joflashstudios
|
10837c46ff
|
Added a few template electrolyzer recipes
|
2015-06-27 03:28:16 -04:00 |
|
Gig
|
6353b9dc06
|
Fixed some small recipe Issues
|
2015-06-27 01:29:20 +01:00 |
|
modmuss50
|
8aaebfeb63
|
Added some useful eel commands, and attempt at fix for reloading every restart.
|
2015-06-26 21:46:47 +01:00 |
|
modmuss50
|
40ca57331c
|
fixes #55
|
2015-06-26 21:28:16 +01:00 |
|
joflashstudios
|
9ae298eacc
|
Merge remote-tracking branch 'origin/master'
|
2015-06-26 13:07:46 -04:00 |
|
joflashstudios
|
1e4e42a202
|
Added thousands separator to make EU in NEI more readable
|
2015-06-26 13:07:25 -04:00 |
|
Gig
|
b0a6a86a5b
|
Merge branch 'master' of https://github.com/TechReborn/TechReborn
|
2015-06-26 17:56:14 +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 |
|
joflashstudios
|
53b2e454ed
|
Fixed another typo I missed
|
2015-06-26 12:40:36 -04:00 |
|
joflashstudios
|
7c7f7a252f
|
Some spelling fixes, added call to addMachineRecipes
|
2015-06-26 12:39:14 -04:00 |
|
Gig
|
6cc1071961
|
made Dungeon loot easy to add
|
2015-06-26 17:22:58 +01:00 |
|
modmuss50
|
15c3608c6e
|
Fixes #53, fixed some render things
|
2015-06-26 13:35:07 +01:00 |
|
modmuss50
|
5fc5aa1e05
|
Fix power flowing thorough covers
|
2015-06-26 08:25:51 +01:00 |
|
modmuss50
|
66ce8d3a47
|
fixed #52
|
2015-06-26 08:21:20 +01:00 |
|
modmuss50
|
0b3736f639
|
fixes #51
|
2015-06-26 08:17:02 +01:00 |
|
joflashstudios
|
c15302a789
|
Cleaned up and automated some recipe stuff
Correct recipes to and from storage blocks are now available. The old wrong ones still need to be removed (e.g. sapphires to chrome block.)
|
2015-06-26 02:09:45 -04:00 |
|
joflashstudios
|
f2667db9de
|
Fixed pointlessly public functions
|
2015-06-25 23:18:22 -04:00 |
|
joflashstudios
|
92c5b5b64b
|
More recipe re-organization
|
2015-06-25 23:02:35 -04:00 |
|
joflashstudios
|
b48dd6582a
|
Moved non-IC2 compat recipes out of IC2 compat class.
All that is in RecipesIC2 now are modifications to IC2 recipes, or additional recipes in IC2 machines.
|
2015-06-25 22:56:02 -04:00 |
|
joflashstudios
|
8814c1b9d2
|
Made GenericRecipeHandler more generic
|
2015-06-25 22:43:40 -04:00 |
|
joflashstudios
|
338575d56d
|
Added iron IBF recipes
|
2015-06-25 22:36:06 -04:00 |
|
joflashstudios
|
7c1aec7e9f
|
Added some Blast Furnace recipes
|
2015-06-25 21:35:05 -04:00 |
|
Gig
|
805f02effb
|
Moved Blast furnace heat value in gui
|
2015-06-26 01:31:47 +01:00 |
|
