Aidan C. Brady
|
a40ab961c6
|
Added OreDict-based dye recipes, fixed MekanismTools item positioning
|
2014-06-14 14:16:33 +02:00 |
|
Aidan C. Brady
|
6ede9308e8
|
A few small fixes
|
2014-06-14 13:49:47 +02:00 |
|
Aidan C. Brady
|
9dea537010
|
Whoops - added indexed click impl
|
2014-06-14 10:30:58 +02:00 |
|
Aidan C. Brady
|
31dd643259
|
Add necessary GUI implementation for new mod ID filters
|
2014-06-14 10:26:12 +02:00 |
|
Aidan C. Brady
|
1a0821c727
|
Found work-around for javac issue - need to remember to submit an issue to oracle tomorrow
|
2014-06-14 01:35:25 +02:00 |
|
Aidan C. Brady
|
7b6eb46a33
|
Hopefully fixed Forge
|
2014-06-14 00:22:15 +02:00 |
|
Aidan C. Brady
|
70abe40b1f
|
Mod ID filters :)
|
2014-06-13 20:58:50 +02:00 |
|
Aidan
|
73135fbb87
|
Merge pull request #1409 from Adaptivity/patch-3
Update ru_RU.lang
|
2014-06-13 19:50:47 +02:00 |
|
Aidan C. Brady
|
c9ce7f1983
|
Hopefully got NEI to download
|
2014-06-13 19:45:28 +02:00 |
|
Aidan C. Brady
|
5a4b229ca6
|
Whoops
|
2014-06-13 12:41:26 +02:00 |
|
Aidan C. Brady
|
c2e0e2eb44
|
Try updating forge
|
2014-06-13 12:40:08 +02:00 |
|
Aidan C. Brady
|
8b7904563d
|
Hopefully fix something
|
2014-06-13 12:27:35 +02:00 |
|
Aidan C. Brady
|
96973190b7
|
Another fix
|
2014-06-13 11:39:04 +02:00 |
|
Aidan C. Brady
|
df13fd4d02
|
Hopefully fixed build
|
2014-06-13 11:37:08 +02:00 |
|
Anton
|
0b3244c4f1
|
Update ru_RU.lang
|
2014-06-13 11:32:19 +04:00 |
|
Aidan C. Brady
|
704b3e2ac1
|
Attempt to fix build script
|
2014-06-13 01:29:27 +02:00 |
|
Aidan C. Brady
|
dd4fa16d00
|
Update FMP and CCLIB versions
|
2014-06-13 00:45:28 +02:00 |
|
Aidan C. Brady
|
43a80c7a89
|
Update forge version
|
2014-06-13 00:34:54 +02:00 |
|
Aidan C. Brady
|
517c2a7655
|
Re-added NEI
|
2014-06-13 00:26:07 +02:00 |
|
Aidan C. Brady
|
c8fb800c1a
|
Updated localization yet again, fixed a small bug
|
2014-06-13 00:16:02 +02:00 |
|
Aidan C. Brady
|
ef7f6e91eb
|
Glow panels now break off of non-solid surfaces
|
2014-06-12 23:36:29 +02:00 |
|
Aidan C. Brady
|
81477966ee
|
Fix all render issues. 1.7 is now officially more stable than 1.6 (but not stable enough)
|
2014-06-12 18:16:20 +02:00 |
|
Aidan
|
9ae7cc0483
|
Merge pull request #1398 from Adaptivity/patch-3
Update en_US.lang
|
2014-06-11 11:59:10 +02:00 |
|
Aidan C. Brady
|
e5f76907ce
|
Rewrite networking code for the 100th time to fix memory leak
|
2014-06-11 11:57:49 +02:00 |
|
Anton
|
2b9735d84c
|
Update en_US.lang
Correct few derps
|
2014-06-10 16:49:19 +04:00 |
|
Aidan C. Brady
|
be3883195c
|
Glow panels render, but are really screwed up
|
2014-06-10 14:09:47 +02:00 |
|
Aidan C. Brady
|
f3894f220c
|
Added repair capabilities to armor and tools
|
2014-06-10 13:25:12 +02:00 |
|
Aidan C. Brady
|
3992a6ae46
|
Several more fixes!
|
2014-06-10 12:56:02 +02:00 |
|
Aidan C. Brady
|
49c7b1062a
|
Improved gas handling, fixed ignoring "NONE" connection. Also got common-side tick handlers up and running again
|
2014-06-10 12:49:49 +02:00 |
|
Aidan C. Brady
|
8685664d51
|
Added Electric Pump energy usage config value, also fixed a few bugs with the new Gas-Burning Generator
|
2014-06-10 12:24:44 +02:00 |
|
Aidan C. Brady
|
d7fdc3a243
|
Greatly improved localization
|
2014-06-10 11:35:54 +02:00 |
|
Aidan C. Brady
|
c875dab552
|
Updated recipes
|
2014-06-09 17:15:34 +02:00 |
|
Aidan C. Brady
|
7c7e5e23ee
|
Update box blacklist to parse with block name instead of ID
|
2014-06-09 17:05:57 +02:00 |
|
Aidan C. Brady
|
d6d7000eaf
|
Update PacketPipeline to reflect new 6.0.5 transmitter packet changes
|
2014-06-09 16:52:29 +02:00 |
|
Aidan C. Brady
|
dd83381774
|
Bug fixes!
|
2014-06-09 16:19:36 +02:00 |
|
Aidan C. Brady
|
726d9ebb0a
|
Atomic Disassembler now can cut down trees with vein mode
|
2014-06-09 15:57:38 +02:00 |
|
Aidan C. Brady
|
85f31fb9d1
|
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
|
2014-06-09 15:29:41 +02:00 |
|
Aidan C. Brady
|
4334690f78
|
Improved localization
|
2014-06-09 15:29:00 +02:00 |
|
Aidan
|
9c3da2348a
|
Merge pull request #1394 from Adaptivity/patch-3
An updated translations 2
|
2014-06-09 12:36:47 +02:00 |
|
Anton
|
dd1ea7fc3e
|
Update de_DE.lang
|
2014-06-09 09:40:28 +04:00 |
|
Anton
|
0cbbc5e29b
|
Update en_US.lang
|
2014-06-09 09:40:04 +04:00 |
|
Anton
|
f55965f53b
|
Update fr_FR.lang
|
2014-06-09 09:39:19 +04:00 |
|
Anton
|
f7c89dcd75
|
Update pl_PL.lang
|
2014-06-09 09:38:14 +04:00 |
|
Anton
|
e806004db7
|
Update pt_BR.lang
|
2014-06-09 09:37:44 +04:00 |
|
Anton
|
38b6765292
|
Update zh_CN.lang
|
2014-06-09 09:37:08 +04:00 |
|
Anton
|
60eb2944f7
|
Update zh_TW.lang
|
2014-06-09 09:35:49 +04:00 |
|
Anton
|
68c64cf44d
|
Update ru_RU.lang
DON'T MERGE YET
|
2014-06-09 09:34:57 +04:00 |
|
Aidan C. Brady
|
75bd49de9d
|
Buffed Salination Plant's water usage
|
2014-06-08 17:39:57 +02:00 |
|
Aidan C. Brady
|
0bb98442b8
|
Fixed a silly bug
|
2014-06-08 16:51:02 +02:00 |
|
Aidan C. Brady
|
d436c70421
|
Merge branch 'master' into development
Conflicts:
build.gradle
build.properties
common/mekanism/common/network/PacketPortableTeleport.java
common/mekanism/tools/common/MekanismTools.java
etc/core/mcmod.info
etc/generators/mcmod.info
etc/tools/mcmod.info
src/main/java/mekanism/common/EnergyNetwork.java
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/common/PacketHandler.java
src/main/java/mekanism/common/network/PacketTransmitterUpdate.java
src/main/java/mekanism/common/tile/TileEntityChargepad.java
src/main/java/mekanism/common/tile/TileEntityEnergyCube.java
src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java
src/main/java/mekanism/generators/common/MekanismGenerators.java
|
2014-06-08 12:01:08 +02:00 |
|