Modmuss50
cb6551c7ca
Fixed compile error with last commit
2015-10-07 11:17:09 +01:00
Modmuss50
6a404ba617
Fixes #166
2015-10-07 11:15:55 +01:00
Modmuss50
9c52e0ace7
Fixes #170 and fixes #167
2015-10-07 08:34:24 +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
e257c424e2
Quick fix for crash, full fix coming tomorrow
2015-10-06 22:57:38 +01:00
Modmuss50
d490d00ab0
Removed forestry version checker, will try fix again later
2015-10-06 21:51:09 +01:00
Modmuss50
599ab5d634
Clean up forestry version checker
2015-10-06 20:47:50 +01:00
Modmuss50
4683f1450f
Disables forestry intergtation when not using version 4 or higher
2015-10-06 20:46:03 +01:00
Modmuss50
9c3bc97af2
Fixes #162 , sorry if it breaks some of your tiles.
2015-10-06 20:39:19 +01:00
Modmuss50
3b7001d44f
Fixes some crashes, added new command, closes #165
2015-10-06 20:35:54 +01:00
Modmuss50
2a314aa4bb
Auto clean of cable class
2015-10-05 17:44:38 +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
04a21f4dc7
Fixes #163
2015-10-05 11:18:44 +01:00
modmuss50
b0c77d4d22
Fixed server crash
2015-10-03 20:29:02 +01:00
modmuss50
91a0d76f46
Disabled recipe config manager(use mine tweaker)
2015-10-03 19:36:49 +01:00
modmuss50
fd4f52e27e
Fixed some issues with cables when using ic2 classic.
2015-10-03 19:21:28 +01:00
modmuss50
a390a37cb1
Fixes forestry saw mill recipes
2015-10-03 12:39:18 +01:00
modmuss50
3708a49bb9
Initial update to forestry 4(Sawmill recipes are not working)
2015-10-03 10:21:13 +01:00
modmuss50
c30633b5d3
Added config for disabling connected textures
2015-10-02 21:09:57 +01:00
modmuss50
146deb0e8b
Added recipes to IC2 classic, fixed recipes when using ic2, fixes #158
2015-10-02 21:01:30 +01:00
Modmuss50
a6792f37c6
Fixes #155 thanks @XuPuPG
2015-09-29 19:13:46 +01:00
modmuss50
219570f288
Added connected textures to reinforced casing
2015-09-26 16:21:50 +01:00
Modmuss50
f5c31a6a31
Added connected textures for the lesu
2015-09-26 16:13:42 +01:00
modmuss50
f889b9a051
Some crappy textures, adds all connected textures
2015-09-26 15:54:25 +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
79d6f81dda
Some texture work on the new connected textures
2015-09-26 13:09:39 +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
2dfaf5e739
Added saving for the PDA
2015-09-23 20:42:42 +01:00
Modmuss50
081f16a533
Removed Farm
2015-09-23 18:58:46 +01:00
gigabit101
97d990e316
small changes to PDA and a start on PdaConfig
2015-09-23 18:29:34 +01:00
Modmuss50
1f2e703c4f
Fixed incorrect location for Blocks API
2015-09-23 17:37:25 +01:00
Modmuss50
3f4b59faaf
Fixes #130
2015-09-23 17:27:41 +01:00
modmuss50
ccaabdd230
Started work on adding the recipes back to ic2 classic
2015-09-20 13:55:54 +01:00
modmuss50
dec36fd47d
Added new method to check if ore is valid. Fixes #150
2015-09-19 19:16:43 +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
aacc73102d
Fixed small issue with get tile meta
2015-09-19 09:27:13 +01:00
modmuss50
5d5f4ec929
Fixes #149
2015-09-19 09:23:39 +01:00
Modmuss50
c424e74473
closes #146
2015-09-16 08:24:58 +01:00
Modmuss50
1a47b56345
Fixes #143
2015-09-15 18:33:32 +01:00
Modmuss50
dc1259c9f6
Fixed some textures
2015-09-15 18:26:29 +01:00
Modmuss50
2b4daf86bb
Fixes #145
2015-09-15 08:30:30 +01:00
Modmuss50
bd1540b27b
Fixed fluid power value importing
2015-09-14 21:34:56 +01:00
Modmuss50
62f68bb5b7
Fixes #144
2015-09-14 21:26:31 +01:00
Modmuss50
29d47ec37e
Fixes #141
2015-09-14 21:23:07 +01:00
Modmuss50
cf49f01042
Added better support for ic2 classic power system
2015-09-14 21:07:44 +01:00
Modmuss50
0bf7e1968e
Fixed ic2 classic support on the master!
2015-09-14 21:05:26 +01:00
modmuss50
61a51b52a7
Fixes #83
2015-09-11 13:34:20 +01:00
modmuss50
96d5304d07
Fixed small issue when not copying the item stack, might help #83
2015-09-11 13:25:33 +01:00
Modmuss50
11fd755619
Fixed issues with the tank not syncing on the disel genertaor
2015-09-10 19:39:00 +01:00
Modmuss50
cd04ae5693
Added command to view fluid fuel power values
2015-09-10 17:48:22 +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
modmuss50
72799a9474
Added some fuels to forestry's api, might write our own and import bc's and forest into ours.
2015-09-08 13:26:24 +01:00
modmuss50
67e6182e44
Fixed centrifuge block icons
2015-09-07 21:17:07 +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
fe11409b4e
Fixed a load of crashes becuase of the new rotation system. Fixed powered tiles
2015-09-05 11:44:41 +01:00
Modmuss50
5fe5fce53c
Fixes #44 Closes #139
2015-09-05 11:40:05 +01:00
Modmuss50
d3e860edb2
Inital port to tile based meta
2015-09-05 09:17:58 +01:00
Nagisa·Jang
af3b605b24
Update zh_CN.lang
2015-09-02 21:34:09 +08:00
modmuss50
ebc685ba3d
Improvements to the compat manager.
2015-08-30 21:16:22 +01:00
Nagisa·Jang
827cf6f969
Update zh_CN.lang
2015-08-30 20:02:07 +08:00
modmuss50
21628a78cb
auto optimise png files
2015-08-27 16:47:32 +01:00
modmuss50
15b9671dc4
fixes #120
2015-08-27 13:09:31 +01:00
modmuss50
d33c93005d
Added all of the machines to minetweaker. (untested)
2015-08-27 10:22:17 +01:00
modmuss50
c8e7e923ed
Added more minetweaker support
2015-08-27 09:04:41 +01:00
modmuss50
f9823b6ba6
Fixed minetweaker support for AlloyFurnace
2015-08-27 08:55:34 +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
modmuss50
d4c663ae72
fixes #116
2015-08-26 09:55:04 +01:00
modmuss50
cb59fff1f0
fixes #126 and fixes #127
2015-08-26 09:52:56 +01:00
modmuss50
103c0b79e4
fixes #119
2015-08-26 00:44:44 +01:00
modmuss50
0154f5a21a
Fixes #124
2015-08-26 00:35:04 +01:00
modmuss50
4d87a27509
fixes #118
2015-08-26 00:27:12 +01:00
modmuss50
fdc6ccf2a0
fixes #122
2015-08-26 00:20:32 +01:00
modmuss50
6fa53f2884
fixes #212
2015-08-26 00:17:04 +01:00
modmuss50
a7154f5056
fixes #117
2015-08-25 18:43:18 +01:00
modmuss50
da538c7d77
fixes #125
2015-08-25 18:38:50 +01:00
modmuss50
e7f85022a4
Merge branch 'master' of https://github.com/Amamiya-Nagisa/TechReborn into Amamiya-Nagisa-master
...
Conflicts:
src/main/resources/assets/techreborn/lang/zh_CN.lang
2015-08-25 18:23:43 +01:00
Nagisa·Jang
e5f23dc073
Update zh_CN.lang
2015-08-23 22:08:24 +08:00
gigabit101
73b85de0ae
fix pda gui texture
2015-08-17 18:45:34 +01:00
gigabit101
8233f1ec8f
color change a format
2015-08-17 18:44:54 +01:00
gigabit101
e8e78c1099
Added multiblock page (WIP)
2015-08-17 18:15:19 +01:00
gigabit101
834b14bc31
Added a button to pda to open Ingame configs
2015-08-17 17:30:54 +01:00
gigabit101
fa00e77ef6
removed some unneeded code
2015-08-17 17:10:20 +01:00
gigabit101
6f549337cd
Added version page
2015-08-17 16:51:58 +01:00
gigabit101
7f889958a2
Cleaner gui
2015-08-17 15:15:22 +01:00
gigabit101
7a50db2d61
More fancy gui stuff (WIP)
2015-08-16 23:59:47 +01:00
gigabit101
323725be11
PDA will now display mod version
2015-08-16 21:36:10 +01:00
gigabit101
388dfc016d
More small changes to pda
2015-08-16 21:29:12 +01:00
gigabit101
25aeaf371e
added recipe for PDA
2015-08-16 21:19:27 +01:00
gigabit101
958a0b32d0
Added items to the pda
2015-08-16 20:46:35 +01:00
gigabit101
73f28281e3
A few more recipe tweeks and configs
2015-08-16 20:41:23 +01:00
modmuss50
ccb028a202
Tweaked thermal generator, closes #100
2015-08-16 12:17:02 +01:00
modmuss50
5b2bc53cfc
Added gui elements to rolling machine. Fixes #95
2015-08-16 12:03:22 +01:00
modmuss50
364d2d68db
Fixed #103
2015-08-16 11:50:37 +01:00
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
primetoxinz
0ac12866e2
couple more textures
2015-08-13 16:58:31 -04:00
primetoxinz
acfa840120
Fix most texture names
2015-08-13 16:53:37 -04:00
primetoxinz
fb38973684
actually fixes it
2015-08-13 16:52:55 -04:00
primetoxinz
bd90b40db6
fix hot tungsten steel texture
2015-08-13 16:41:47 -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
7f86d116cb
fixed pda texture
2015-08-10 18:31:07 +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
TehporP
24a68bd292
Update zh_CN.lang
2015-08-09 13:21:53 +08:00
TehporP
7dc3a50b1c
Update zh_CN.lang
2015-08-09 09:04:50 +08:00
TehporP
31c17617b6
Update zh_CN.lang
2015-08-09 08:58:52 +08:00
TehporP
c970ec3445
Update zh_CN.lang
2015-08-09 08:36:21 +08:00
Nagisa·Jang
74cb2a4107
Update zh_CN.lang
2015-08-08 22:43:49 +08:00
TehporP
a1551967ec
Create zh_CN.lang
...
I will start translating job a bit later
2015-08-08 08:54:24 +08: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
modmuss50
f8803f3be1
Removed the univseral jar appendix, fixed small typo
2015-08-05 10:13:05 +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
36ecb9c3f3
Merge branch 'master' of https://github.com/TechReborn/TechReborn
2015-07-23 16:57:21 +01:00
modmuss50
ef11f111ed
Started work on a way to find duplicate items
2015-07-23 16:57:06 +01:00
Modmuss50
e1b0c7af06
Merge pull request #86 from Mazdallier/patch-1
...
Update fr_FR.lang
2015-07-23 16:19:37 +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
Mazdallier
c1643152a9
Update fr_FR.lang
2015-07-23 16:38:02 +02: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
Mazdallier
e4cfa69ba1
Update fr_FR.lang
...
config update
2015-07-08 14:08:56 +02: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
