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 |
|
lehjr
|
ce2e548239
|
fix meters
|
2015-10-29 10:31:19 -04:00 |
|
lehjr
|
81f9a7377a
|
That doesn't belong in a for loop
|
2015-10-28 18:16:11 -04:00 |
|
lehjr
|
1a2f452914
|
Just a bit more cleanup
|
2015-10-28 15:43:54 -04:00 |
|
lehjr
|
071fd49035
|
OOPS!
|
2015-10-27 14:47:59 -04:00 |
|
lehjr
|
07d278ec53
|
couple more things
|
2015-10-27 14:43:09 -04:00 |
|
lehjr
|
2380b53f36
|
even more cleanup (might get there eventually)
|
2015-10-25 13:21:37 -04:00 |
|
lehjr
|
37f2e0c0d6
|
Cleanup some things and add Intellij 1.4 fix. Thanks Xen1290
|
2015-10-22 10:28:51 -04:00 |
|
lehjr
|
72eab6609b
|
MPSA merge pretty much done with nearly everything working. May need a bit of tweaking and cleanup
|
2015-10-21 22:04:23 -04:00 |
|
lehjr
|
151390fc08
|
add MPSA existing language info. Still needs someone to complete it.
|
2015-10-21 21:51:08 -04:00 |
|
lehjr
|
0667f49fed
|
merge MPSA textures
|
2015-10-21 21:42:55 -04:00 |
|
lehjr
|
9800ca7412
|
add CoFH access transformers neeed to run in dev environment
|
2015-10-21 21:38:57 -04:00 |
|
MachineMuse
|
cc1c9fcc82
|
added pinkbyte's fix to axe & shovel modules
|
2015-10-08 22:03:59 -06:00 |
|
MachineMuse
|
547e62b62f
|
Merge remote-tracking branch 'origin/experimental' into experimental
|
2015-10-05 22:54:21 -06:00 |
|
MachineMuse
|
f9c13bc986
|
use pinkbyte's fix for the pickaxe modules
|
2015-10-05 22:54:14 -06:00 |
|