modmuss50
|
da538c7d77
|
fixes #125
|
2015-08-25 18:38:50 +01:00 |
|
modmuss50
|
07f858aa77
|
Merge branch 'Amamiya-Nagisa-master'
|
2015-08-25 18:24:04 +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
|
85d19144b0
|
ALPHA 0.3.2
|
2015-08-15 23:38:22 +01:00 |
|
gigabit101
|
d17276e96d
|
Added config's to disable mod integration closes #111
|
2015-08-15 23:31:02 +01:00 |
|
modmuss50
|
33c2375246
|
Updated things
|
2015-08-15 17:16:05 +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 |
|
Modmuss50
|
1c74e3ce7a
|
Merge pull request #110 from primetoxinz/master
Fix invisibility potions and cloaking device
|
2015-08-14 00:07:05 +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 |
|
Modmuss50
|
f62c774f68
|
Merge pull request #109 from primetoxinz/master
Finished Cloaking Device
|
2015-08-13 23:47:47 +01:00 |
|
primetoxinz
|
199bbf28b6
|
Finished Cloaking Device
|
2015-08-13 18:46:01 -04:00 |
|
Modmuss50
|
e73fc58fc9
|
Merge pull request #108 from primetoxinz/master
Fix most missing textures
|
2015-08-13 22:09:20 +01: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 |
|
