Commit graph

1245 commits

Author SHA1 Message Date
lehjr f1ffd6ebb2 Fix OmniWrench crash without CoFH Lib/Core 2016-05-23 11:23:25 -04:00
florian96 146afeb0ab Added Recipes for GregTech 5 (and Maybe GT 6)
Based on the Old 1.6.4 Recipes. A little bit Modified.
2016-05-17 21:15:26 +02:00
Claire 8df562c8ca Merge pull request #710 from AegisLesha/patch-2
Update fr_FR.lang
2016-03-09 16:33:38 -08:00
Jean-Marie c680bd8d62 Update fr_FR.lang
Small corrections
2016-03-09 23:59:09 +01:00
Claire d32199fed9 Merge pull request #695 from lehjr/experimental
Fix wrong check for RF API
2016-01-19 12:01:46 -08:00
lehjr b57e5f3095 Fix wrong check for RF API 2016-01-18 15:49:28 -05:00
Claire 43c6951714 Merge pull request #694 from lehjr/experimental
Fixes https://github.com/MachineMuse/MachineMusePowersuits/issues/688
2016-01-18 11:34:06 -08:00
lehjr 03de123c80 Revert change to Wireless Fluid Terminal module
This is depreciated and needs to be changed AFTER a newer version is uploaded to the server.
2016-01-18 10:37:50 -05:00
lehjr 68f49306f5 Fix RF API provided by mod other than CoFHCore
Added partial Applied Energistics power API
2016-01-18 10:22:37 -05:00
Claire 5548d72a17 Merge pull request #687 from lehjr/experimental
Fix EnderIO recipes
2016-01-13 16:24:24 -08:00
lehjr d0b6062176 Update mps-enderio.recipes 2016-01-13 11:17:18 -05:00
lehjr 1608a3b063 fix typo 2016-01-13 10:27:05 -05:00
lehjr f1d32f9f7b Update mps-enderio.recipes 2016-01-13 10:06:59 -05:00
lehjr 8b19f96c92 Fix EnderIO recipes
fixes https://github.com/MachineMuse/MachineMusePowersuits/issues/685
2016-01-13 09:21:48 -05:00
Claire a618ab21b6 Merge pull request #679 from lehjr/experimental
no oredict entry in vanilla for ice?
2016-01-03 07:41:32 -07:00
lehjr 685c74bebd no oredict entry in vanilla for ice? 2016-01-03 08:57:44 -05:00
Claire 1ed85ad0c5 Merge pull request #677 from lehjr/experimental
Fix vanilla recipes
2016-01-02 10:33:10 -07:00
lehjr a604b6b7ef Fix vanilla recipes 2015-12-31 20:43:39 -05:00
Claire fa138e98b2 Merge pull request #675 from lehjr/experimental
Fix for Hard to break certain blocks #628
2015-12-29 00:09:28 -07:00
lehjr 87cec3cc96 Another experimental fix for MachineMuse#628 - The Saga Continues! 2015-12-27 20:28:50 -05:00
lehjr afa939f5fb Another experimental fix for MachineMuse#628 continued 2015-12-27 15:10:19 -05:00
lehjr 8722d6cf25 Another experimental fix for https://github.com/MachineMuse/MachineMusePowersuits/issues/628 2015-12-27 15:02:48 -05:00
Claire 00f727a832 Merge pull request #670 from lehjr/experimental
Fix filling of water tank
2015-12-20 23:57:08 -07:00
lehjr 9a7efc0df1 Fix filling of water tank 2015-12-18 08:56:37 -05:00
Claire a91cbeff3d Merge pull request #668 from lehjr/experimental
Heat meter no longer requires power storage (Capacitor) to be installed to be visible
2015-12-17 19:32:33 -08:00
lehjr 0666e76757 Heat meter no longer requires power storage to be installed to be visible 2015-12-17 14:42:49 -05:00
Claire 296e5101f4 Merge pull request #666 from lehjr/experimental
Fix minimum Numina version, update forge version, partial fix for leaf blower
2015-12-15 14:37:59 -08:00
lehjr f705462c9c Fix minimum Numina version 2015-12-15 16:02:18 -05:00
lehjr 4adebb4c23 Updated Forge version and partial fix for LeafBlower module 2015-12-15 15:53:25 -05:00
Claire db4d7d6c9e Merge pull request #664 from lehjr/experimental
experimental fix for https://github.com/MachineMuse/MachineMusePowersuits/issues/628
2015-12-14 12:10:52 -08:00
lehjr e8bf5415cd experimental fix for https://github.com/MachineMuse/MachineMusePowersuits/issues/628 2015-12-11 15:53:04 -05:00
Claire 540f146126 Merge pull request #655 from Joccob/patch-1
Update zh_CN.lang
2015-12-04 10:57:42 -08:00
Joccob 2c605494fc Update zh_CN.lang 2015-11-30 18:05:10 -06:00
MachineMuse 92a04a1ccd update library deps for new modules by lehjr 2015-11-29 21:40:45 -08:00
Claire 03cfed71e2 Merge pull request #648 from lehjr/experimental
Set minimum Numina version dynamically
2015-11-26 15:09:27 -08:00
Claire bb7e96e65b Merge pull request #650 from Xen1290/experimental
Recipes Update
2015-11-26 15:07:40 -08:00
Xen1290 ca86297086 Updated Vanilla recipes. Finished the recipes update! 2015-11-25 14:53:33 +01:00
Xen1290 85aeaeaa81 Updated Ender IO recipes 2015-11-25 14:53:09 +01:00
Xen1290 1e99002b03 Updated Thermal Expansion recipes 2015-11-25 14:52:40 +01:00
Xen1290 1d20df7a5b Initial recipes update. Please backup and reset your config and recipes file!
Updated IC2 recipes
2015-11-25 14:52:13 +01:00
lehjr 7d7f5c5f8a Set minimum Numina version dynamically 2015-11-21 20:35:28 -05:00
Claire 2b8c14ec75 Merge pull request #632 from lehjr/experimental
MPSA merged
2015-11-20 18:00:06 -08:00
lehjr 1ed249a1b0 Fix error: Ore dic broken - Forge 1558 https://github.com/MachineMuse/MachineMusePowersuits/issues/643 2015-11-16 18:38:18 -05:00
lehjr de811d83f0 fix IC2 charge crashes with tooltips 2015-11-13 20:03:26 -05:00
lehjr f11151a7ff switch to newer builds of Extra Cells. 2015-11-13 14:20:18 -05:00
lehjr 0ea50e6951 Fix use of depreciated AE2 methods for compatibility with RV2 and RV3 2015-11-13 14:08:13 -05:00
lehjr 21f21dfc83 temporary fix for "Can't charge with IC2" 2015-11-13 14:06:24 -05:00
lehjr 26c9f2740e Add minimum Numina version 2015-11-13 14:02:38 -05:00
lehjr 0d81fae701 mark gradlew as executable 2015-11-02 13:24:24 -05:00
lehjr 0dcea74e61 Add MPSA recipies from QMX fork 2015-10-29 19:40:40 -04:00