Commit graph

136 commits

Author SHA1 Message Date
Ben Spiers
be33883a53 Merge pull request #762 from VeryBigBro/patch-3
Update ru_RU.lang
2013-12-30 05:15:12 -08:00
Anton
5bf4b55550 Update ru_RU.lang 2013-12-30 14:08:21 +03:00
Vexatos
2d260d1b72 Update de_DE.lang 2013-12-30 09:16:38 +01:00
Ben Spiers
ebc1cce01d Update names of some things.
Translations will need updating, @Vexatos, @VeryBigBro, @crafteverywhere
2013-12-30 03:03:57 +00:00
Ben Spiers
c3d3c789bb British English localisation 2013-12-29 20:45:36 +00:00
Aidan C. Brady
a41760affd Chemical Injection Chamber initial work 2013-12-24 00:23:30 -05:00
Anton
5650ae38d1 Update ru_RU.lang 2013-12-22 14:39:34 +03:00
Anton
e163d5e6bd Update ru_RU.lang
some work
2013-12-21 19:54:29 +03:00
Aidan Brady
f2d202d90f Work on transporters 2013-12-20 17:46:24 -05:00
Aidan Brady
40e2d3b7fc Bump version, work on multipart transporters 2013-12-20 16:47:09 -05:00
Aidan Brady
6b5f8833f0 Have Logistical Transporters use interfaces instead of directly referencing classes; should make multipart support easy 2013-12-19 18:21:12 -05:00
Aidan Brady
8057d605a1 Merge branch 'master' into development 2013-12-15 14:19:57 -05:00
crafteverywhere
f673244293 Update zh_CN.lang 2013-12-15 20:19:09 +08:00
Aidan Brady
345aecb4db Merge branch 'master' into development 2013-12-14 17:58:13 -05:00
Aidan C. Brady
1e1eabfd5e Even more localization, fixed a few tiny bugs 2013-12-14 15:13:12 -05:00
Vexatos
fc0a611f93 Update de_DE.lang 2013-12-13 19:50:48 +01:00
Aidan Brady
2d5b633168 Work on stuff 2013-12-12 20:35:37 -05:00
Aidan Brady
faa127ddd8 Add textures for Sulfuric Gas & Sulfuric Acid 2013-12-11 20:46:39 -05:00
Aidan Brady
5a241ce8ee Work on GUIs 2013-12-11 20:24:37 -05:00
Aidan Brady
250ddadcf0 Dictionary! :) 2013-12-09 20:52:49 -05:00
Aidan Brady
3c4d776e24 Added lead ore processing 2013-12-09 18:30:50 -05:00
Vexatos
461e2886ab Typo fix. Let's hope is was a typo.
Let's hope is was a typo.
2013-12-09 19:23:03 +01:00
Vexatos
02fcac8967 Loads of work done. (Updated de_DE.lang)
Yes, "Minierer" is a German word.
2013-12-09 19:22:05 +01:00
Aidan Brady
916859c21d Added description text to machines 2013-12-06 20:03:25 -05:00
Aidan C. Brady
cb9900bbc7 Work on gas masks/scuba gear stuff 2013-12-06 15:26:44 -05:00
Aidan Brady
c3a985f273 Kill off wires for the last time, fix up jetpacks 2013-12-05 21:10:15 -05:00
Aidan C. Brady
a204df448f Work on jetpacks 2013-12-05 15:50:38 -05:00
Aidan Brady
38dda1d18e Fix name, add a few more particle effects 2013-12-04 20:01:27 -05:00
Vexatos
538fdbcce4 Couldn't you have done this yourself? Nevermind... 2013-12-04 15:31:31 +01:00
Aidan Brady
afe85f9215 Fix some pesky bugs and crashes 2013-12-03 16:56:03 -05:00
Vexatos
278b46a8dd Update de_DE.lang 2013-12-03 15:39:26 +01:00
Aidan Brady
934d537230 Fix a few issues 2013-12-03 07:18:40 -05:00
Vexatos
c0b57017df Update de_DE.lang 2013-12-03 07:48:00 +01:00
Aidan Brady
30237b34ac Delete old textures, add Copper and Tin blocks 2013-12-02 20:52:44 -05:00
Aidan C. Brady
57caab2062 Wire fixes 2013-12-02 17:04:41 -05:00
Vexatos
f5f9dca4ee Update de_DE.lang 2013-12-02 19:08:17 +01:00
Calclavia
07332ca245 Merge branch 'master' into universal-wires
Conflicts:
	common/mekanism/induction/common/MekanismInduction.java
	resources/assets/mekanism/lang/en_US.lang
2013-12-02 19:47:38 +08:00
Aidan Brady
e42ab62e2a Begin work on copper and tin ore and ingots :) 2013-12-01 21:58:35 -05:00
Aidan Brady
83bca26455 Remove Maganese Alloy in hopes for better balance, fixed several GUI color issues as well as Osmium Ore darkness 2013-12-01 17:45:19 -05:00
Aidan Brady
66cba8d50b Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-12-01 14:03:06 -05:00
Aidan Brady
7ebd132b6e Fixed teslas, merged Electrostatic Linker into Configurator 2013-12-01 14:03:00 -05:00
Vexatos
aa4610330c Update de_DE.lang 2013-12-01 18:43:13 +01:00
Aidan Brady
f55d3ac874 Added Factory input slot distribution, configurable voice ports, fixed several bugs 2013-12-01 12:38:34 -05:00
Vexatos
76b7ea116d Shorten the GUI stuff. I hope it is short enough for the GUIs 2013-12-01 09:08:11 +01:00
Calclavia
0205d7722e Readded universal wires into Mekanism Induction 2013-12-01 13:46:15 +08:00
Aidan Brady
0c618a1cf3 Localization & gas fixes 2013-11-30 11:31:18 -05:00
Vexatos
e2a432fe11 Update de_DE.lang 2013-11-30 08:47:03 +01:00
Aidan Brady
ba32a2b112 More localization support! 2013-11-30 00:43:54 -05:00
Aidan Brady
b224a01f39 Work on localization support, move around some API classes to make better compatibility 2013-11-30 00:28:02 -05:00
Aidan Brady
00b4c6f3e3 Rendering and transmitter performance enhancements, finish Rotary Condensentrator for the most part 2013-11-28 21:43:53 -05:00
Aidan Brady
419a295096 Work on Rotary Condensentrator, fix IC2 energy integration (mostly) 2013-11-27 18:17:44 -05:00
Aidan Brady
22fe896bcd Finish multi-ID machine support 2013-11-27 16:17:10 -05:00
crafteverywhere
492e95a9c2 Update zh_CN.lang 2013-11-27 13:34:14 +08:00
Sakarias Longhorn
e08b34395e French Translation 2013-11-27 00:52:47 +01:00
Vexatos
f36fde885d Update de_DE.lang 2013-11-26 21:15:09 +01:00
Vexatos
08c8341eeb That'll work. 2013-11-26 21:12:14 +01:00
pixlepix
dc1743d517 Divertion transporter fixes, including name change 2013-11-23 07:28:01 -05:00
Aidan Brady
0e2d2917d1 Remove Capacitor and Empty Capacitor, fix mouses, made sorter and miner maintain configuration 2013-11-21 21:37:03 -05:00
Aidan C. Brady
995207bcab Start work on Miner, make the Bin only eject items when front side is clicked! 2013-11-18 15:33:14 -05:00
Anton
99178d8e68 Swap Glow and Steel names to match with other(No other changes) 2013-11-18 14:50:18 +03:00
Anton
3dc83d8296 Create ru_RU.lang
Not yet finished...
2013-11-18 14:47:40 +03:00
crafteverywhere
fdf09fcfde Update zh_CN.lang 2013-11-17 11:21:43 +08:00
Vexatos
a6e017549c No more wires? :( 2013-11-16 21:43:02 +01:00
Aidan C. Brady
cc48b614ba Remove wire 2013-11-16 12:26:49 -05:00
Aidan C. Brady
ed637e4eed Follow Mekanism naming standards 2013-11-16 11:05:04 -05:00
Aidan C. Brady
53323279c7 MekanismInduction module - done!
Still need to configure the build
2013-11-16 10:21:37 -05:00
Aidan Brady
f6704dc5ea Added name for bins, fixed IC2 bug, hopefully fixed ConcurrentModificationException 2013-11-11 17:23:14 -05:00
Aidan Brady
01a6174fdb Lots of things! 2013-11-03 16:54:33 -05:00
Aidan Brady
c3fa020561 New Electric Pump model! 2013-11-03 12:07:23 -05:00
Ben Spiers
3c3bc631f0 Update en_US.lang
Manganese was misspelled
2013-11-02 23:19:43 +00:00
Aidan C. Brady
91a8839203 Deleted Theoretical Elementizer, Weather Orb, and Steve's Stopwatch. They are no longer fitting for Mekanism's goal. 2013-11-01 11:33:00 -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 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
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
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
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