Commit graph

198 commits

Author SHA1 Message Date
Modmuss50
2c31b9211c Started work on the player detector. 2015-11-18 20:59:08 +00:00
Modmuss50
08cbe33f00 Fixes #263 2015-11-18 20:14:46 +00:00
Mazdallier
6efa1de164 Update fr_FR.lang
all done
2015-11-17 10:22:27 +01:00
Modmuss50
f42c127201 Added basic fustion reactor multiblock checking. 2015-11-16 15:20:19 +00:00
Mazdallier
81b45789ac Update fr_FR.lang
big update to continuous line 695
2015-11-16 15:40:43 +01:00
Modmuss50
100293fb8e Started work on reactor. 2015-11-16 13:36:44 +00:00
Modmuss50
9b1378a64c Fixes #269 2015-11-15 21:12:31 +00:00
Modmuss50
df5bd1422a Fixes #267 2015-11-15 20:54:31 +00:00
gigabit101
421597fbab Added missing localizations closes #242 2015-11-13 16:48:51 +00:00
gigabit101
0ebf0c95dd more charge slots 2015-11-13 16:29:35 +00:00
Modmuss50
08a3636e72 Fixes #260 2015-11-12 21:00:03 +00:00
Modmuss50
5419067213 Work for #242 2015-11-12 08:32:14 +00:00
Modmuss50
842fa421ae Fixes #243 2015-11-11 17:00:18 +00:00
Modmuss50
47a466ef21 Some fixes for #242 2015-11-11 15:24:13 +00:00
Modmuss50
701c658323 Fixes all of #242 2015-11-11 13:17:14 +00:00
MrBretzel
1307406e10 Adding iron alloy smelter to not enough items and fix ChargedHud possible crash 2015-11-01 23:10:32 +01:00
gigabit101
57b85450e6 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-11-01 16:55:02 +00:00
gigabit101
206d09ed31 Added a bunch more localization 2015-11-01 16:54: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
MrBretzel
28b0a5da8c Move to png
Fix bug
2015-10-25 08:14:08 +01:00
MrBretzel
67398ca163 Move to jpeg
just a bug...
2015-10-25 08:13:38 +01:00
modmuss50
81c498086a closes #176 2015-10-10 16:51:56 +01:00
gigabit101
a8ea0f55e7 Removed a load of un needed junk from other versions of Gtech 2015-10-09 21:55:54 +01:00
gigabit101
5a230b20a2 Fix's #185 2015-10-09 21:10:20 +01:00
Modmuss50
caca45d86b Removed Iron Gear Texture 2015-10-07 16:09:14 +01:00
Modmuss50
75e2bd4733 Machines now explode when they come in contact with rain. 2015-10-07 15:41:26 +01:00
modmuss50
c30633b5d3 Added config for disabling connected textures 2015-10-02 21:09:57 +01:00
modmuss50
219570f288 Added connected textures to reinforced casing 2015-09-26 16:21:50 +01:00
modmuss50
f889b9a051 Some crappy textures, adds all connected textures 2015-09-26 15:54:25 +01:00
modmuss50
79d6f81dda Some texture work on the new connected textures 2015-09-26 13:09:39 +01:00
gigabit101
97d990e316 small changes to PDA and a start on PdaConfig 2015-09-23 18:29:34 +01:00
Modmuss50
3f4b59faaf Fixes #130 2015-09-23 17:27:41 +01:00
Modmuss50
c424e74473 closes #146 2015-09-16 08:24:58 +01:00
Modmuss50
dc1259c9f6 Fixed some textures 2015-09-15 18:26:29 +01:00
modmuss50
e02b1518d2 updates to the aesu gui 2015-09-05 21:09:37 +01:00
Nagisa·Jang
af3b605b24 Update zh_CN.lang 2015-09-02 21:34:09 +08: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
cb59fff1f0 fixes #126 and fixes #127 2015-08-26 09:52:56 +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
7f889958a2 Cleaner gui 2015-08-17 15:15:22 +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
modmuss50
44c5037b28 Added config settings for power net, closes #112 2015-08-15 17:03:28 +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