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
Aidan C. Brady
934f136d4f
Intelligent inventory parsing to strategically find and grab OreDict-relative entries
2013-12-25 19:18:07 -05:00
Aidan C. Brady
d0d4a858e1
Fixed a small bug
2013-12-25 17:57:27 -05:00
Aidan C. Brady
047ead8d09
Added a delay to Digital Miner eject, have multipart Logistical Transporters drop contents when broken, fixed transporters insertion logic
2013-12-25 17:43:44 -05:00
Aidan C. Brady
7010f03b65
Fixed a container bug that could have been driving some people nuts
2013-12-25 00:50:23 -05:00
Aidan C. Brady
9730bc261e
Fixed IC2 weird clump things replacing Mekanism recipes
2013-12-25 00:33:08 -05:00
Aidan C. Brady
583ef4fc19
More efficient redstone control
2013-12-25 00:03:04 -05:00
Aidan C. Brady
0ee53780b6
No one sends that many packets when I'm around
2013-12-24 23:29:37 -05:00
Aidan Brady
28a63cc9d2
More proxy fixes, chemical injection chamber sound
2013-12-24 17:17:00 -05:00
Aidan Brady
3ed2d3ce6c
Fixed render crash
2013-12-24 17:14:28 -05:00
Aidan Brady
de3b0cb208
Fix factory injecting support
2013-12-24 17:06:35 -05:00
Aidan Brady
fdc94550ee
Fix a few bugs
2013-12-24 16:58:14 -05:00
Aidan Brady
3cea13a272
Hopefully fix JZ’s compile bug
2013-12-24 16:41:01 -05:00
Aidan Brady
7a71bc7848
Better holiday stuff
2013-12-24 16:06:57 -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 Brady
8323ea6415
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
2013-12-24 13:28:27 -05:00
Aidan Brady
df95a64409
Finish merge
2013-12-24 13:28:20 -05:00
Aidan Brady
fd26b9b11b
Work on a little Christmas surprise
2013-12-24 13:25:31 -05:00
Aidan C. Brady
9498b01475
Finished off the Chemical Injection Chamber, just need sounds
2013-12-24 12:39:27 -05:00
Aidan C. Brady
4cf33562c6
Merge branch 'master' into development
2013-12-24 12:19:24 -05:00
Aidan C. Brady
9fbbc8381f
Separated OreDict management from Mekanism, added proper recipes for Chemical Injection Chamber
2013-12-24 11:55:40 -05:00
Aidan C. Brady
1477b6ba7c
Finished shard textures
2013-12-24 11:40:19 -05:00
Aidan C. Brady
bd1e3234ff
Fixed crash
2013-12-24 11:20:22 -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
Aidan C. Brady
9cc243a244
Properly use IFluidBlock.drain() when draining fluid blocks
2013-12-23 23:20:53 -05:00
Aidan C. Brady
9ed16f3006
A few fixes, please update!
2013-12-23 20:23:37 -05:00
Aidan C. Brady
52319ed31e
A few fixes, please update!
2013-12-23 20:23:23 -05:00
Aidan C. Brady
6df7544540
Loads of javadocs, cleaned up Gas API code, removed old induction interfaces, made configurable machines notify neighbor when configuration changes, added functionality for GasStack-based ChemicaIInputs.
2013-12-23 17:06:22 -05:00
Aidan
824a3e0306
Merge pull request #739 from VeryBigBro/patch-1
...
Update ru_RU.lang
2013-12-22 20:25:13 -08:00
Aidan C. Brady
b060c2c005
Fix silly upgrade GUI bug
2013-12-22 23:24:20 -05:00
