Commit graph

522 commits

Author SHA1 Message Date
Aidan C. Brady
a8d6386bb5 GUIs are cool :D 2013-10-26 19:04:33 -04:00
Aidan C. Brady
3a9a518188 Major GUI work! 2013-10-26 13:25:51 -04:00
Aidan
c730fab1eb Merge pull request #325 from magik6k/master
Add Polish translation
2013-10-25 21:04:49 -07:00
Aidan Brady
51f24f058a Worked on that GUI, I think I've got down how this is gonna work 2013-10-26 00:02:57 -04:00
Aidan Brady
8bb6b7ac43 Merge branch 'master' of https://github.com/aidancbrady/Mekanism
Conflicts:
	common/mekanism/client/render/tileentity/RenderLogisticalTransporter.java
2013-10-25 21:36:33 -04:00
Aidan Brady
b405c42e2f Remove useless InventoryNetwork 2013-10-25 21:34:55 -04:00
Aidan C. Brady
b8935f8f7a Started on sorter GUI! 2013-10-25 18:08:13 -04:00
Aidan C. Brady
b49defae88 Fixed some things!! 2013-10-25 17:11:15 -04:00
Aidan C. Brady
8d9ee35679 Sorter work - hopefully outputs items now! :D 2013-10-25 16:07:25 -04:00
magik6k
6d5ae084ec Add Polish translation 2013-10-25 20:55:50 +02:00
Aidan C. Brady
e9c038cd24 More progress on Logistical Sorter 2013-10-25 09:51:13 -04:00
Vexatos
5c17c17302 I rarely had that much fun with translating a mod, I don't know, why. 2013-10-25 14:55:18 +02:00
Aidan C. Brady
5a748c5ff6 More work on the Logistical Sorter! 2013-10-25 08:51:13 -04:00
Aidan C. Brady
51289b82c2 Made base code for Logistical Sorter, this may end up being more complex than the transporters themselves. 2013-10-25 00:23:38 -04:00
Aidan C. Brady
609d9c5d17 Fixed server connection issue! 2013-10-24 17:14:09 -04:00
Aidan C. Brady
5c1c8350a3 Alright, build fixed :) 2013-10-24 11:55:33 -04:00
Aidan C. Brady
6b6a834a09 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-10-24 11:38:29 -04:00
Aidan C. Brady
61f8a06d48 Fixed pathfinding, hopefully fixed crash and build failure 2013-10-24 11:38:23 -04:00
Aidan Brady
54ac6bac5c Deleted old files 2013-10-23 22:50:10 -04:00
Aidan C. Brady
ab8361f9e8 Just about finished rendering! :D 2013-10-23 20:34:33 -04:00
Aidan C. Brady
84f7bd1f85 Finished core code for item tags, onto rendering! 2013-10-23 17:56:35 -04:00
Aidan C. Brady
61c7b3e4cd Started adding color tags for transport, shouldn't be too hard! 2013-10-23 08:50:27 -04:00
Aidan C. Brady
9983ee4a70 Killed a few lines of code that were the result of two crashes. 2013-10-23 08:16:29 -04:00
Aidan Brady
da71396128 Functional inventory management :D 2013-10-22 22:47:46 -04:00
Aidan C. Brady
4f773bbbf9 Began adding inventory algorithms. 2013-10-22 22:29:25 -04:00
Aidan C. Brady
9fabab18a3 Just about done with rendering, next steps are final bug fixes and inventory management implementations 2013-10-22 21:13:23 -04:00
Aidan C. Brady
8cc6d3222a Fix up bounds 2013-10-22 11:20:04 -04:00
Aidan C. Brady
89eda12200 Got more things working! 2013-10-22 11:08:28 -04:00
Aidan C. Brady
c7dcea6a06 Rendering is partially-functional; I have an idea to make this more efficient, will do later 2013-10-22 07:54:09 -04:00
Aidan C. Brady
33c8f960f3 Some work on rendering, still really incomplete 2013-10-21 23:46:24 -04:00
Aidan C. Brady
ed5c30fb0a More work, fixing client crashes 2013-10-21 23:03:54 -04:00
Aidan C. Brady
b4e53a5c54 More work on logistical transporters, getting these logistics down! 2013-10-21 20:54:28 -04:00
Aidan Brady
4b82ab6cc1 Work on transporters, don't use them unless you like buggy item transport pipes that currently do nothing 2013-10-20 22:47:20 -04:00
Aidan C. Brady
5b44e0f409 Synchronized network code, should be thread safe. 2013-10-20 00:04:11 -04:00
Aidan C. Brady
f3838a1f7e Hopefully fixed BuildCraft powerHandler bug 2013-10-19 23:36:09 -04:00
Aidan C. Brady
e150df8743 Fixed NEI, fixed TNT dupe 2013-10-19 12:55:21 -04:00
Aidan C. Brady
8c51e4dd25 Fixed possible VoiceInput crash 2013-10-19 12:35:55 -04:00
Aidan C. Brady
7c2fabca6a New Enrichment Chamber sound :) 2013-10-19 12:34:04 -04:00
Aidan Brady
f646ecdff6 Kill connection if unable to trace IP 2013-10-18 20:24:12 -04:00
Aidan Brady
9ed6614e5b More, shorter retries 2013-10-18 20:21:52 -04:00
Aidan Brady
ea21ad0061 Synchronization and better connection management 2013-10-18 20:17:40 -04:00
Aidan Brady
61d046b518 Hopefully fixed walkie talkies 2013-10-18 20:05:47 -04:00
Aidan Brady
d8a806ebab Debugging walkie talkies, don't use this build unless you like console spam 2013-10-18 19:09:08 -04:00
Aidan C. Brady
0350eef398 Minor changes 2013-10-18 07:33:27 -04:00
Aidan C. Brady
17d0e20bdb Fix server crash 2013-10-16 13:49:31 -04:00
Aidan C. Brady
a5a4c7a65a Prevent possible server crash 2013-10-15 19:57:18 -04:00
Aidan C. Brady
1b717267f3 Moved client-sensitive info over to MekanismClient 2013-10-14 23:36:07 -04:00
Aidan C. Brady
c0651a9377 Fixed walkie talkies stacking, they now glow when in on state 2013-10-14 16:13:32 -04:00
Aidan
3dc2f49f76 Merge pull request #290 from Vexatos/patch-1
Walkie talkies?!?!?!?!?!?!?!?!?!?!?!?!?
2013-10-14 12:54:49 -07:00
Aidan C. Brady
15cba39b30 Fixed capes :) 2013-10-14 15:54:10 -04:00