Commit graph

47 commits

Author SHA1 Message Date
Aidan Brady
04d9b3dc68 Some fixes 2013-10-30 20:35:11 -04:00
Aidan
e786422f9c Merge pull request #342 from Vexatos/patch-1
Update de_DE.lang
2013-10-30 16:13:23 -07:00
Aidan C. Brady
0090624a57 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-10-30 15:22:46 -04:00
Aidan C. Brady
656f74983f Lots of progress on ejectors and GUIs 2013-10-30 15:22:43 -04:00
Vexatos
37fdc2d01b Update de_DE.lang 2013-10-30 18:51:00 +01:00
crafteverywhere
47c481816e Create zh_CN.lang 2013-10-30 18:24:55 +08:00
Aidan C. Brady
9496f7dfa3 Rewrote pathfinder, added in Restrictive Transporters, added option to have null color in filters, added default outputting filter for sorter
whoo!
2013-10-29 18:13:30 -04:00
Aidan C. Brady
5e7c01c1af Client/server GUI communication logistics 2013-10-27 17:29:34 -04:00
Aidan C. Brady
f60106f0e9 Filter panel buttons render! 2013-10-27 15:00:22 -04:00
Aidan C. Brady
4272c4cb6d Fix up custom slot render, got scroll bar working 2013-10-27 11:44:19 -04:00
Aidan Brady
340ccd1e87 Slightly better packet management, removed Control Panel 2013-10-27 00:08:39 -04:00
Aidan
5e587629bf Merge pull request #324 from Vexatos/patch-1
I rarely had that much fun with translating a mod, I don't know, why.
2013-10-26 20:55:23 -07: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 C. Brady
b8935f8f7a Started on sorter GUI! 2013-10-25 18:08:13 -04:00
magik6k
6d5ae084ec Add Polish translation 2013-10-25 20:55:50 +02: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
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 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
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
89eda12200 Got more things working! 2013-10-22 11:08: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
7c2fabca6a New Enrichment Chamber sound :) 2013-10-19 12:34:04 -04:00
Vexatos
5ac008ea53 Walkie talkies?!?!?!?!?!?!?!?!?!?!?!?!? 2013-10-14 19:31:20 +02:00
Aidan C. Brady
0d7b2414ce Walkie Talkie foundation! :D 2013-10-13 12:31:26 -04:00
Aidan C. Brady
a6ed1c054e Re-added maganese 2013-10-13 01:19:18 -04:00
Aidan C. Brady
9194f71630 Merge branch 'master' of https://github.com/aidancbrady/Mekanism
Conflicts:
	common/mekanism/common/Mekanism.java
2013-10-13 01:04:04 -04:00
Aidan C. Brady
b1c2afd68d Add proper IC2 item support, add maganese for future use 2013-10-13 01:01:30 -04:00
Ben Spiers
308c333fc4 Merge pull request #287 from Vexatos/patch-2
Thank you.
2013-10-12 09:24:54 -07:00
Vexatos
ade414f2b8 That was needed. 2013-10-12 18:19:54 +02:00
Vexatos
c9afe5192a Fixed stuff
Electric bow entry doubled.
2013-10-12 18:19:43 +02:00
Ben Spiers
189c6d4551 L10n support by popular demand. Closes #204 2013-10-12 16:43:56 +01:00
Aidan C. Brady
bf1150e2cb Fixed minor GUI issues, recipe type interface is now a GuiElement
Oh, I'm not dead btw
2013-10-08 17:47:03 -04:00
Aidan Brady
08fda4cdd5 Upgrade refactoring, CURRENTLY BROKEN 2013-08-25 20:54:34 -04:00
Aidan Brady
55fee96644 Updated IC2 API (again), added obsidian 200% ore-to-dust processing 2013-08-25 12:02:25 -04:00
Aidan C. Brady
7a7b398f31 Several bugfixes, overhaul of TileEntity-based upgrade management 2013-08-24 21:22:45 -04:00
Aidan Brady
7e167b753a Logistical Transporters now have complete network functionality. Actual item transport is the next step!
Also fixed various network bugs. :)
2013-08-06 01:40:41 -04:00
Aidan Brady
3fd76dcacc Began work on Logistical Transporter - item transport :) 2013-08-03 23:02:06 -04:00
Aidan Brady
47c36f1f38 Added redstone control to machines, generators, Energy Cubes and Gas Tanks; fixed Heat Generator NBT bug
Also - cleanup! Closes #214.
2013-08-02 03:16:38 -04:00
Ben Spiers
0188882688 Fix the Electric Pump's render texture 2013-07-29 21:00:51 +01:00
Aidan Brady
5d26f8e229 Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
Aidan Brady
cfc5dff445 First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
Aidan Brady
b313f0f96e Slightly better transmitter rendering, better energy cube outputting 2013-07-08 12:06:39 -04:00
Aidan Brady
7df5888bd3 Added EnergyMeter 2013-07-02 19:03:03 -04:00
Aidan Brady
b255a98a74 Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00