Commit graph

1120 commits

Author SHA1 Message Date
Exidex
3d56bf1206 Some stuff I did 2018-01-06 18:46:17 +02:00
Exidex
cadf93eba7 Remove ic2 dependency, rename progress bar image names 2018-01-05 23:41:13 +02:00
SuperCoder79
0c91618a9c Add textures and jsons for metaitems (#1366)
* Fix all material icon texture errors
2018-01-05 22:59:58 +02:00
Dragon2488
0b9d2d287b Merge branch '1.12.2' of https://github.com/Blood-Asp/GT5-Unofficial 2018-01-06 01:59:28 +07:00
Dragon2488
52d41f5626 item colors 2018-01-06 01:57:26 +07:00
Exidex
b80145aab3 Fix infinite while(true) 2018-01-04 22:51:59 +02:00
Exidex
aa2fdc9a20 Energy transfer logic. Test generator. Several other fixes
(cherry picked from commit cc05bf5)
2018-01-04 19:14:00 +02:00
Exidex
fab9d6a9cc Change some material colors and texture sets to represent them better (#1362) 2018-01-03 12:49:15 +01:00
Dragon2488
3b30363342 Merge branch '1.10.2' of https://github.com/Blood-Asp/GT5-Unofficial 2018-01-03 02:16:28 +07:00
Dragon2488
b9f6963d88 bump. added some basic cable networking. 2018-01-03 02:11:51 +07:00
Exidex
9ecb18aed6 Fix several server side issues 2018-01-02 19:34:11 +02:00
Exidex
6c54a1bb22 Fix crash on startup because of removed dependency. Rearrange localization staff 2018-01-01 23:46:21 +02:00
Exidex
d42dff2d80 Remove dependencies 2018-01-01 23:14:32 +02:00
Exidex
23c1b5ee9c Add ProgressWidget and LabelWidget 2018-01-01 19:36:23 +02:00
Exidex
d25acb2197 Furnace is kinda working... 2017-12-31 00:49:22 +02:00
Exidex
d22da2f971 Fix ModularUI client desync. Fix not dark gui background in ModularUI. Rearrange textures 2017-12-30 02:01:40 +02:00
Exidex
c9c8480336 Fix mouse cursor not showing up when custom UI was opened 2017-12-13 22:47:30 +01:00
Exidex
8c2e715b46 Fix MTE crash on UI click 2017-11-26 17:39:27 +01:00
Exidex
d84a4042c1 Fix MTE UI kick from server on opening 2017-11-26 14:06:01 +01:00
Exidex
323048d717 Rework recipe removal 2017-11-25 23:36:59 +01:00
Antifluxfield
dd2bd8703c Compressed Block registry rework (#1290) 2017-11-25 20:36:19 +02:00
Exidex
1922244a61 Add GTVersion, Integrated circuit. Change IFluidStats 2017-11-24 23:45:02 +01:00
Exidex
92dcd816b3 Meh Fluids 2017-11-20 21:32:39 +01:00
Exidex
fe0f1383ce Working metaitem rendering. 2017-11-12 19:05:39 +01:00
Exidex
b1a35f9741 Half working metaitem rendering. 2017-11-06 21:12:58 +01:00
Exidex
517b8f6c1f Delete Any* MarkerMaterials. Add color handling for MTEs 2017-11-05 19:56:27 +01:00
Exidex
be07e216a3 Fix compile-time error 2017-11-05 00:11:40 +01:00
Exidex
d599b7d649 Working MTE rendering. Started Gui testing. 2017-11-05 00:06:24 +01:00
Exidex
2bf92a34af MTE rendering. Not quite working 2017-11-04 11:50:31 +01:00
Exidex
00f9a008bc Update UI system according to capability changes.
Remove some not needed capabilities. Add placeholder for some blockstates
2017-10-21 15:00:02 +02:00
Exidex
492ec07f71 Bring AT back 2017-10-15 17:42:48 +02:00
Exidex
a1a32588be Fix registering and rendering 2017-10-15 17:35:50 +02:00
Exidex
efd2e9fe5e Rework capabilities. Port to 1.12 2017-10-02 21:37:18 +02:00
Archengius
2d54025044 cleanup materialsets textures 2017-09-23 22:56:35 +07:00
Exidex
41d06a0a60 Merge remote-tracking branch 'upstream/1.10.2' into 1.10.2 2017-09-23 17:27:20 +02:00
Exidex
4f2c8f41e5 Stuff and things. Test MTE. 2017-09-23 17:26:34 +02:00
Techlone
4d2117d0e0 Merge branch '1.10.2' of https://github.com/Blood-Asp/GT5-Unofficial into mc10 2017-09-18 01:40:37 +05:00
Techlone
9d81558fad Del empty textures 2017-09-18 01:40:10 +05:00
Exidex
144e269dd1 Fix item loading NPE 2017-09-17 21:37:09 +02:00
Techlone
039fcef3dc Del handle_mallet* 2017-09-17 16:30:02 +05:00
Techlone
eada15f2cd Del (ingot|plate)_(double|triple|quard|quint) 2017-09-17 16:22:59 +05:00
Techlone
8529ee428f Del crate*.png and tool*.png 2017-09-17 16:19:15 +05:00
Archengius
528d2ed40a compressed blocks and ores rendering now work, some start of work on meta-items 2017-09-17 14:58:42 +07:00
Techlone
9275ca7891 Textures renaming IV 2017-09-17 05:38:54 +05:00
Techlone
7d8627dc7f Textures renaming IV 2017-09-17 05:38:34 +05:00
Techlone
b8166c47ba Textures renaming III 2017-09-17 05:36:22 +05:00
Techlone
11c4f826db Textures renaming III 2017-09-17 05:35:32 +05:00
Exidex
36af4e55fd Ore rendering and cover items 2017-09-17 01:11:08 +02:00
Techlone
5f9e6fdbfe Textures renaming II 2017-09-16 21:55:49 +05:00
John
61f0a302d9 Merge pull request #1221 from Techlone/1.10.2
Textures renaming I
2017-09-16 20:27:21 +05:00