Commit graph

1104 commits

Author SHA1 Message Date
MachineMuse
a788576515 add hazmat module to english localization 2015-08-30 15:49:06 -06:00
MachineMuse
9ddba86df1 fix wrong recipes 2015-08-30 15:04:11 -06:00
MachineMuse
dd7b2633c7 add enderIO to auto-extract 2015-08-30 13:16:19 -06:00
Claire
442383ede5 Merge pull request #603 from Xen1290/experimental
Updated Recipes
2015-08-30 13:08:54 -06:00
Xen1290
7c77a80a3b Update build script 2015-08-30 19:19:37 +02:00
Xen1290
e8de46ae18 New EnderIO recipes 2015-08-30 19:17:14 +02:00
Xen1290
9d7965f696 Updated vanilla recipes 2015-08-30 19:15:52 +02:00
Xen1290
4c8966fbca Updated thermal expansion recipes 2015-08-30 18:59:01 +02:00
Xen1290
e18aa275e1 Updated ic2 recipes 2015-08-30 18:58:49 +02:00
Xen1290
5096898b90 Merge remote-tracking branch 'MachineMuse/experimental' into experimental 2015-08-30 18:53:58 +02:00
MachineMuse
d6388fd5d5 Merge remote-tracking branch 'origin/experimental' into experimental 2015-08-30 07:56:30 -06:00
MachineMuse
250943aae9 localize nei handler 2015-08-30 07:56:21 -06:00
Claire
11c57969fc Merge pull request #601 from 3TUSK/patch-1
Update zh_CN.lang
2015-08-30 00:19:50 -06:00
Urey.X.
b9ffbddcdc Update zh_CN.lang 2015-08-30 01:38:57 -04:00
Claire
6dfedcc48c Merge pull request #596 from Xen1290/experimental
Update some information
2015-08-29 14:11:42 -06:00
Xen1290
f490a82407 Update
- Fixed logo not loading
- Added some useful information to readme for users
2015-08-29 22:05:55 +02:00
MachineMuse
e17437e1c5 Merge remote-tracking branch 'origin/experimental' into experimental 2015-08-29 13:32:15 -06:00
MachineMuse
1cd51b8ce8 made recipes more robust and fixed auto-extract 2015-08-29 13:31:49 -06:00
Claire
d179beddf8 Merge pull request #595 from Vexatos/patch-2
Update de_DE.lang
2015-08-29 12:33:21 -06:00
Vexatos
6dabcd4bff Update de_DE.lang 2015-08-29 20:29:29 +02:00
Claire
c5797c110b Merge pull request #593 from Adaptivity/patch-1
Update ru_RU.lang
2015-08-29 11:19:28 -06:00
Anton
80e3c7761d Update ru_RU.lang 2015-08-29 20:17:07 +03:00
MachineMuse
b770400261 add getters back in 2015-08-29 11:14:34 -06:00
MachineMuse
54557e24b9 catching the right Throwable would help 2015-08-29 11:10:50 -06:00
MachineMuse
67d5a23010 another possible workaround for chisel duality 2015-08-29 11:04:13 -06:00
MachineMuse
9763cd546b trying a different way of having both chisel modules 2015-08-29 10:56:20 -06:00
MachineMuse
1a0a99f3da add compatibility for new Chisel branch 2015-08-29 10:17:17 -06:00
MachineMuse
1de180f8e4 add try/catch for chisel module 2015-08-29 10:03:32 -06:00
MachineMuse
88e8237cb7 small refactor 2015-08-29 09:25:51 -06:00
MachineMuse
c9c47b6f44 added most gui elements to localization 2015-08-29 08:24:19 -06:00
MachineMuse
ef8d1d7ab8 Moved module descriptions to language files. Now it's up to you, my other-language-speaking friends! 2015-08-29 07:58:17 -06:00
MachineMuse
a30e461066 Fixed binoculars module and added it back in 2015-08-29 07:12:24 -06:00
MachineMuse
18b3cbc357 Added IC2 electric item API classes to repo as a workaround for stripping issue, added PinkByte's fixes back in 2015-08-29 04:59:16 -06:00
MachineMuse
8bead3071e Removed more MJ references 2015-08-29 00:37:10 -06:00
MachineMuse
1bde9bc4dc Removed shaders. Closes #580 2015-08-29 00:33:23 -06:00
MachineMuse
c33e9a17c2 changed chisel module cost to be appropriate to its function 2015-08-29 00:20:04 -06:00
MachineMuse
b89277dbb7 Add optional chisel harvest module. Closes #563 2015-08-28 23:44:15 -06:00
MachineMuse
bb40be7775 Removed unused Omnitools & Basic Components code. Closes #587 2015-08-28 23:16:03 -06:00
MachineMuse
2e36168b13 Fixed mod loading order 2015-08-28 23:11:03 -06:00
MachineMuse
bb04d37ee7 change to latest stable build of EnderIO 2015-08-28 13:54:09 -06:00
MachineMuse
c3b2ab36bd created custom install cost file & auto-generate example. Changed item registry name for components so back up items 2015-08-28 13:02:50 -06:00
MachineMuse
677da80e8d automatically copy out recipe files & cleaned up some old config options 2015-08-28 11:20:12 -06:00
MachineMuse
77a74d05fe more code inspection refactors 2015-08-28 10:18:30 -06:00
MachineMuse
4f6f4827b8 fix age-old misspelling 2015-08-28 09:58:15 -06:00
MachineMuse
87fd176872 changed how branches are recognized 2015-08-28 09:16:29 -06:00
MachineMuse
bbb86f1de9 add automatic release type classification 2015-08-28 08:22:12 -06:00
MachineMuse
a58049845d add automatic release type classification 2015-08-28 08:06:39 -06:00
MachineMuse
28f9d16c33 update Galacticraft dependency 2015-08-28 06:18:25 -06:00
MachineMuse
7c3cd2a825 fixed mekanism modid & removed redundant optional interfaces 2015-08-28 06:05:28 -06:00
MachineMuse
81296da54d update CoFHCore 2015-08-28 06:02:38 -06:00