Aidan Brady
00bbb9d5c4
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2014-01-02 13:00:15 -05:00
Aidan Brady
3990ab4f42
Have NEI plugin iterate over possible fuel stacks, register sulfur dust in oredict
2014-01-02 13:00:09 -05:00
Aidan C. Brady
a5e62bf7a9
Fixed factory connection issue
2014-01-01 20:02:10 -05:00
Aidan C. Brady
ea76a68112
Fix factory GUI support with sulfuric acid
2014-01-01 19:26:20 -05:00
Aidan C. Brady
c72f04b61b
Fixed factory gas management bug
2014-01-01 19:07:14 -05:00
Ben Spiers
0385123a46
Unfudge that merge.
2014-01-01 23:35:13 +00:00
Ben Spiers
7236638d59
Clean up supportsUpgrades a bit
2014-01-01 23:13:04 +00: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
Aidan
a5e33d0158
Merge pull request #771 from VeryBigBro/patch-5
...
Update ru_RU.lang
2014-01-01 09:40:54 -08: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
Aidan
4f0b47a56f
Merge pull request #769 from VeryBigBro/patch-4
...
Update ru_RU.lang
2014-01-01 00:22:54 -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 Brady
692a8a0412
Finished Chemical Infuser rendering, added in recipes for new machines (including Combiner which means there may be a tiny conflict if you’ve already started on the name change @unpairedbracket)
...
Also…happy new year everyone :)
2014-01-01 00:58:58 -05: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
371efa9ece
Fix item render
2013-12-31 16:51:02 -05:00
Aidan C. Brady
08f0b93873
Fix Chemical Oxidizer operation issue
2013-12-31 16:42:26 -05: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
Ben Spiers
da8417b7be
Merge pull request #760 from Vexatos/patch-1
...
Update de_DE.lang
2013-12-30 05:15:01 -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
14b9d7b22d
Gradilisation, without moving everything around because that's annoying and makes merges difficult, and this way ant will still work as well.
...
`gradle :build` builds MekanismAll.jar (couldn't make it do separate ones on its own)
`gradle :releaseJars` generates MekanismCore, MekanismGenerators and MekanismTools.
It would be helpful if anyone has a maven repository of CB's mods...
2013-12-29 20:45:36 +00:00
Ben Spiers
c3d3c789bb
British English localisation
2013-12-29 20:45:36 +00:00
Aidan Brady
de93c376f6
Fix a little chunk loading issue
2013-12-28 22:09:33 -05:00
Aidan Brady
e6051ee2e5
Fixed TE bug
2013-12-28 14:16:04 -05:00
Aidan C. Brady
4210d15f1a
Fixed connections to machines
2013-12-27 22:34:05 -05:00
Aidan C. Brady
6923d89fd1
Fix BioGenerator render texture
2013-12-27 22:20:27 -05:00
Aidan C. Brady
e36e62b6be
Better client energy scales in universal cables, made Logistical Transporter pull mode take one item at a time to give L. Sorter an advantage
2013-12-27 21:50:24 -05:00
Aidan C. Brady
aca4b461b7
Transporter fixes
2013-12-27 18:21:17 -05:00
Aidan C. Brady
2241e7e7b9
A few fixes
2013-12-27 12:44:08 -05:00
Aidan C. Brady
e4521c0841
Polish transmitter recipes
2013-12-27 00:54:33 -05:00
Aidan C. Brady
cd719660ad
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2013-12-26 20:27:29 -05:00
Aidan C. Brady
65fb6208fb
A few tweaks to recipe balance
2013-12-26 20:27:21 -05:00
Ben Spiers
c1daf00154
Hopefully fix the weird compile problem in a smoother way (the generic gets erased at compile time anyway but apparently IDEA thinks it matters).
2013-12-27 01:21:55 +00:00
Ben Spiers
fa3aef17b6
Fix configurable upgrade modifiers (8.0 is because 8 is maximum number of upgrades (not 9, I was being silly before) and we want to return def*upgradeModifier^1 when fully upgraded).
2013-12-27 01:21:55 +00:00
Aidan Brady
9feaae03bb
Multipart BC support, fixed recipe
2013-12-26 19:44:11 -05:00
Aidan Brady
1573474654
Update BC & IC2 APIs
2013-12-26 15:00:08 -05:00
Aidan C. Brady
4d64afb7d9
Made KeySync use keybinds instead of defaults
2013-12-26 12:02:17 -05:00
Aidan C. Brady
c3ce0cc58d
Cleaned up multipart transmitter code a bit, fixed a chunk-related connection issue
2013-12-26 02:05:25 -05:00
