Aidan
|
f74ac247fb
|
Update build.properties
|
2014-02-10 20:34:44 -05:00 |
|
Aidan
|
775da9d395
|
Update build.properties
|
2014-02-10 20:32:27 -05:00 |
|
Aidan
|
99c4fa8458
|
Update build.xml
|
2014-02-10 20:26:51 -05:00 |
|
Aidan
|
22c97f2c91
|
Merge pull request #913 from Mierzen/patch-1
Fix Copper ore tooltip typo
|
2014-01-25 11:10:13 -08:00 |
|
Mierzen
|
4ac0244b25
|
Fix typo
|
2014-01-25 18:35:30 +02:00 |
|
Aidan C. Brady
|
9aef5beed3
|
Bump version to 5.7.0 due to Vaygrim's request, closes #808
|
2014-01-11 11:00:55 -05:00 |
|
Ben Spiers
|
ea7a421d7b
|
Backport CableUtils optimisations to master branch
|
2014-01-10 21:27:51 +00:00 |
|
Aidan
|
6072b1cb8f
|
Merge pull request #765 from crafteverywhere/patch-2
Update zh_CN.lang
|
2013-12-30 23:17:38 -08:00 |
|
crafteverywhere
|
3c3f6577be
|
Update zh_CN.lang
|
2013-12-31 11:37:59 +08:00 |
|
Aidan Brady
|
0b861f71af
|
TEMP FIX for Wylker, will be rolled back for matured changes in v6
|
2013-12-28 22:17:05 -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 C. Brady
|
bd1e3234ff
|
Fixed crash
|
2013-12-24 11:20:22 -05:00 |
|
Aidan C. Brady
|
9ed16f3006
|
A few fixes, please update!
|
2013-12-23 20:23:37 -05:00 |
|
Aidan Brady
|
f7f9da8ae9
|
Fixed Digital Miner crash, made things efficient, fixed dupe bug
|
2013-12-18 18:57:15 -05:00 |
|
Aidan C. Brady
|
65c201d829
|
Add try/catch to prevent OreDict iteration GUI render crash
|
2013-12-18 12:05:09 -05:00 |
|
Aidan C. Brady
|
6ae1177c8e
|
Fix that horrible Digital Miner bug once and for all
|
2013-12-18 11:52:24 -05:00 |
|
Aidan Brady
|
98c56904e1
|
Merge “Fix crash”
|
2013-12-15 23:15:01 -05:00 |
|
Aidan Brady
|
53a5b515f0
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-12-15 14:19:25 -05:00 |
|
Aidan Brady
|
5cd968f09c
|
Fixed bin bug
|
2013-12-15 14:19:16 -05:00 |
|
Aidan
|
f893d3f317
|
Update README.md
|
2013-12-15 14:17:03 -05:00 |
|
Aidan
|
953d4851fe
|
Merge pull request #705 from crafteverywhere/patch-2
Update zh_CN.lang
|
2013-12-15 10:49:01 -08:00 |
|
crafteverywhere
|
f673244293
|
Update zh_CN.lang
|
2013-12-15 20:19:09 +08:00 |
|
Aidan Brady
|
a6887eb813
|
Fixed tank crash
|
2013-12-15 00:43:47 -05:00 |
|
Aidan Brady
|
c73259f092
|
Killed off old TE API, moved PipeUtils to proper loc
|
2013-12-14 22:50:37 -05:00 |
|
Aidan Brady
|
9558c6f6ca
|
Fix GregTech conflict
|
2013-12-14 17:58:01 -05:00 |
|
Aidan Brady
|
926cca0e0a
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-12-13 23:17:16 -05:00 |
|
Aidan Brady
|
ea57bb5990
|
Fix crash
|
2013-12-13 23:03:20 -05:00 |
|
Aidan
|
74a40ec1b9
|
Merge pull request #698 from Vexatos/patch-2
Update de_DE.lang
|
2013-12-13 15:29:56 -08:00 |
|
Aidan Brady
|
7555fbee7c
|
Update UE
|
2013-12-13 17:15:53 -05:00 |
|
Vexatos
|
fc0a611f93
|
Update de_DE.lang
|
2013-12-13 19:50:48 +01:00 |
|
Aidan C. Brady
|
85a2c981df
|
Fixed Adv Solar Generator config
|
2013-12-12 13:56:00 -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
|
6114463852
|
Work on TileEntity code of Chemical Formulator
|
2013-12-11 19:53:12 -05:00 |
|
Aidan Brady
|
7a3c678d76
|
Work on new machines
|
2013-12-11 18:26:10 -05:00 |
|
Aidan Brady
|
123ae05dcd
|
Cleaned up contractor code
|
2013-12-11 18:10:01 -05:00 |
|
Aidan Brady
|
2d626f2279
|
Work on Chemical Infuser & Chemical Formulator recipe system
|
2013-12-11 17:08:15 -05:00 |
|
Aidan C. Brady
|
7e48fa2743
|
Work on container code
|
2013-12-11 16:34:54 -05:00 |
|
Aidan C. Brady
|
a4e8158448
|
Add GUIs for T3 ore processing machinery
|
2013-12-10 18:51:16 -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 |
|
Aidan Brady
|
add3cf0bf6
|
Bug fixes!
|
2013-12-09 17:54:59 -05:00 |
|
Aidan Brady
|
ac31fc2b4e
|
More work on networking system, unstable
|
2013-12-09 17:34:53 -05:00 |
|
Aidan Brady
|
26f0f83574
|
Work on initial data system for jetpacks/gasmasks
|
2013-12-09 17:08:47 -05:00 |
|
Aidan Brady
|
44a69da8a1
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-12-09 17:00:29 -05:00 |
|
Aidan Brady
|
7506b8fed8
|
Fix particles
|
2013-12-09 17:00:21 -05:00 |
|
Aidan C. Brady
|
54a10af2d7
|
A few tiny fixes
|
2013-12-09 17:00:08 -05:00 |
|
Aidan
|
a1e1c06bcd
|
Merge pull request #672 from Vexatos/patch-2
Loads of work done. (Updated de_DE.lang)
|
2013-12-09 12:54:38 -08:00 |
|