Aidan C. Brady
ea76a68112
Fix factory GUI support with sulfuric acid
2014-01-01 19:26:20 -05:00
Aidan C. Brady
67d38fd179
Removed Chemical Combiner (hopefully all references)
2014-01-01 16:21:55 -05:00
Ben Spiers
a07ca18997
Change to Infuser for final stage of the contact process
2014-01-01 19:55:18 +00:00
Anton
13a322d6ee
Update ru_RU.lang
...
Tooltips translated.
2014-01-01 17:45:43 +03:00
Aidan
4785182513
Merge pull request #770 from Vexatos/patch-1
...
Update de_DE.lang
2014-01-01 00:23:34 -08:00
Vexatos
0703bb66d5
Update de_DE.lang
2014-01-01 08:56:34 +01:00
Anton
f9dce4d5e5
Update ru_RU.lang
2014-01-01 10:53:50 +03:00
Aidan C. Brady
c1e40be9ad
Added Chemical Infuser model, still need to add dynamic rendering (shouldn't be too hard since I already have Chemical Oxidizer framework complete
2013-12-31 22:54:39 -05:00
Ben Spiers
544d96f3bc
Get most of the contact process stuff working with WIP textures and such. .langs will need updating again for new things (Chemical Combiner is a provisional name though, for the time being.)
2014-01-01 03:03:23 +00:00
Ben Spiers
571ad3944f
Sulphur dioxide and sulphur trioxide
2013-12-31 22:24:46 +00:00
Aidan
69032ed2a0
Merge pull request #768 from Vexatos/patch-1
...
Update de_DE.lang
2013-12-31 13:51:21 -08:00
Aidan C. Brady
2dc6a35d16
Fix a GUI bug, fixed gas tanks not loading properly, fix a few culling issues with Chemical Oxidizer, made gas render visually in Chemical Oxidizer
2013-12-31 16:38:40 -05:00
Vexatos
5f3dca8baf
Update de_DE.lang
2013-12-31 22:05:39 +01:00
Aidan C. Brady
a277b6e266
Fixed a few bugs and reverted name changes of Sulfuric Acid in liquid/gas form. Even though it's not scientifically correct, it fits better with the Mekanism theme and is easier to understand.
2013-12-31 15:23:04 -05:00
Aidan C. Brady
750bb2dab7
Rename Oxidation Chamber to Chemical Oxidizer and added model, will explain why below. This means a minor lang update @crafteverywhere, @VeryBigBro, @Vexatos
...
Notice that all Mekanism machines that perform similar tasks have a similar ending word; for example, the Metallurgic Infuser infuses alloys into ingots, and the Chemical Infuser infuses chemicals into other chemicals. Every ore processing machine has "Chamber" as the final word, and as this is not directly linked to ore processing, it would be best to move the "Oxidation" side of the machine to the end. Furthermore, for this chemical line, I am trying to keep "Chemical" as the first word in each machine title: Chemical Infuser, Chemical Oxidizer, Chemical Injection Chamber, etc. Hope that makes sense!
2013-12-31 15:07:09 -05:00
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
48b3e48ed3
Re-enable indev machines for now, change Chemical Formulator to Oxidation Chamber, introduce sulphur dust.
2013-12-30 02:59:45 +00:00
Ben Spiers
c3d3c789bb
British English localisation
2013-12-29 20:45:36 +00:00
Aidan Brady
28a63cc9d2
More proxy fixes, chemical injection chamber sound
2013-12-24 17:17:00 -05:00
Aidan C. Brady
d63628bebc
Merge branch 'master' into development
...
Conflicts:
common/mekanism/client/ClientProxy.java
common/mekanism/client/HolidayManager.java
common/mekanism/client/sound/SoundHandler.java
common/mekanism/client/sound/TileSound.java
2013-12-24 14:44:17 -05:00
Aidan Brady
84f4eaee76
Christmas fun :)
2013-12-24 14:38:12 -05:00
Aidan C. Brady
1477b6ba7c
Finished shard textures
2013-12-24 11:40:19 -05:00
Aidan C. Brady
4cfee657a0
Begin work on shard textures, still have a few to go
2013-12-24 11:17:52 -05: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
510debc0fb
Kill induction module and start on balloons :)
2013-12-20 01:05:41 -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
Ben Spiers
52939f763b
Large Model variants. Fluid contents rendering still needs work but that's not using an obj model. It could potentially; it would be a lot cleaner in code but would mean a *lot* of blender work.
2013-12-18 18:42:05 +00:00
Ben Spiers
8199408e75
Side-specific changeable models. They don't behave differently yet but that should be possible now without too much trouble.
2013-12-17 20:02:29 +00:00
Ben Spiers
3a97630f55
Add new shapes to small model.
2013-12-17 02:21:30 +00:00
Aidan Brady
d21ef524a0
Work on jetpacks/scuba stuff
2013-12-15 16:07:30 -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
11c7efd8fc
Merge branch 'api-change' into multipart-experimental-new
2013-12-12 22:36:00 -05:00
Aidan Brady
2d5b633168
Work on stuff
2013-12-12 20:35:37 -05:00
Aidan Brady
43d3050b40
Work on Chemical Infuser
2013-12-12 18:33:56 -05:00
Ben Spiers
98c8068a0f
Get Mechanical Pipe rendering working a bit better.
2013-12-12 20:23:03 +00:00
Aidan Brady
31f8566a1f
Merge branch 'master' into multipart-experimental-new
...
Conflicts:
common/mekanism/common/Mekanism.java
2013-12-12 08:43:21 -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
2d626f2279
Work on Chemical Infuser & Chemical Formulator recipe system
2013-12-11 17:08:15 -05:00
