Commit graph

1042 commits

Author SHA1 Message Date
MachineMuse
1aadba5fff Removed Travis 2015-08-27 23:22:48 -06:00
MachineMuse
946ca71814 move chmod before_install 2015-08-27 11:18:04 -06:00
MachineMuse
bd27f4a897 changing the chmod command 2015-08-27 11:16:22 -06:00
MachineMuse
48631473f1 trying script on new line 2015-08-27 11:05:01 -06:00
MachineMuse
c2974018da trying script on new line 2015-08-27 11:03:57 -06:00
MachineMuse
fa64ef2136 trying script on new line 2015-08-27 11:02:50 -06:00
MachineMuse
ba00088d1e trying script on new line 2015-08-27 11:02:26 -06:00
MachineMuse
d3956df9f7 better organization for Travis 2015-08-27 10:55:25 -06:00
MachineMuse
1029bc7459 add chmod task to travis 2015-08-27 10:52:51 -06:00
MachineMuse
6723b9d866 set up for travis 2015-08-27 10:41:08 -06:00
MachineMuse
05cef6e751 add MFR hammer? I think? 2015-08-27 09:07:20 -06:00
MachineMuse
1c97268635 add Crescent Hammer (Thermal Expansion) and Crowbar (Railcraft) back to Omniwrench Module 2015-08-27 09:02:26 -06:00
MachineMuse
8d1c865dc5 change build.gradle to use dev jars rather than APIs in most cases 2015-08-27 09:01:08 -06:00
MachineMuse
cc05edfc1e update apis in build.gradle 2015-08-27 08:20:49 -06:00
MachineMuse
9a4a81a9a1 player sounds set up, all seems to be working! closes #546 2015-08-27 05:20:00 -06:00
MachineMuse
e1793c7b41 updated soundloader & gui sounds working; in-world sounds TBI 2015-08-27 03:22:10 -06:00
MachineMuse
968764d79e added stuff to fit with SmartRender 2015-08-26 09:16:01 -06:00
MachineMuse
766801f2d5 Changed how RenderPlayerAPI compatibility is processed and fixed animation 'sticking' 2015-08-26 07:54:58 -06:00
MachineMuse
74e51c7c89 Fixed blocking animation; closes #499 2015-08-25 21:08:03 -06:00
MachineMuse
41bd2aa687 hacky fix for transparency module & added isRiding field to those copied from the base model 2015-08-25 20:33:06 -06:00
MachineMuse
4515caa8ae changed many Optional.Interface to one InterfaceList 2015-08-25 08:33:49 -06:00
MachineMuse
e6f05a5224 removed error spam when shaders fail 2015-08-25 08:21:01 -06:00
MachineMuse
dab1bc6861 removed slick-util and dependency on it; don't need custom fonts 2015-08-25 07:54:04 -06:00
MachineMuse
15cedbace4 fixed optional methods, removed part of IC2 support due to problems with interface stripping 2015-08-25 07:23:53 -06:00
MachineMuse
f79fe7d0dd add interface stripping for IToolGrafter 2015-08-25 06:35:22 -06:00
MachineMuse
5e3bdc8eb7 nvm, MuseElectricItem is a better place 2015-08-25 06:28:35 -06:00
MachineMuse
c0855df989 Added maxdamage=0 so hopefully things stop breaking the armor unnecessarily. Closes #579 2015-08-25 06:20:56 -06:00
MachineMuse
388821ed1b fixed deps to download properly 2015-08-25 05:54:56 -06:00
MachineMuse
ad3461672d Merge remote-tracking branch 'origin/master' 2015-08-25 05:48:15 -06:00
Claire
42df739b0d Merge pull request #573 from Pinkbyte/forestry-fixes
Restore Forestry compatibility. Closes #543
2015-08-25 05:42:17 -06:00
Claire
8452c18b12 Merge pull request #568 from Pinkbyte/ic2-fixes
Restoring Industrial Craft 2 compatibility. Closes #551
2015-08-25 05:40:08 -06:00
MachineMuse
aed150a6cf Brought forge version and NEI versions forward 2015-08-25 05:21:34 -06:00
Sergey Popov
567bf0208c Make power helmet with Apiarist Armor upgrade show pollinated leaves(as original Apiarist Armor do) 2015-05-18 13:55:26 +03:00
Sergey Popov
a104260e61 Restore Grafter module 2015-05-15 22:41:15 +03:00
Sergey Popov
48d7c00f8e Fix price for Apiarist Armor module 2015-05-15 17:58:38 +03:00
Sergey Popov
a0a683f444 Restore ArmorTraits usage 2015-05-14 15:56:17 +03:00
Sergey Popov
3932db4226 Restore ArmorTraits for Forestry 2015-05-14 15:19:29 +03:00
Claire
cd1af7e298 Merge pull request #567 from Pinkbyte/recipes_fix
Fix recipes
2015-04-27 14:44:57 -06:00
Claire
88502051d1 Merge pull request #566 from iMarbot/master
Added IC2 Recipes
2015-04-27 14:43:27 -06:00
Sergey Popov
f93be8a44a Restoring Industrial Craft 2 compatibility 2015-03-28 18:21:03 +03:00
Sergey Popov
a9625405c1 Fix recipes - make oreDict references for wool and glass blocks, fixes MachineMuse/MachineMusePowersuits#524 2015-03-28 11:32:24 +03:00
iMarbot
1198d027b1 Added IC2 Recipes
Added IC2 Recipe file bases on the recipes on
http://www.machinemuse.net/recipes.php except that using iron plates
instead of refined iron because it is now steel and much harder to get,
and the machine blocks in ic2 are made with them too now, not refined
iron.
2015-02-12 20:02:05 +00:00
Claire
d7b9aba63c Merge pull request #558 from KasimAhmic/patch-1
Updates MPS recipes for TE4
2015-02-09 17:10:48 -07:00
Claire
ac0bb8c2f0 Merge pull request #557 from EzerArch/master
Create pt_BR and pt_PT lang files
2015-02-09 17:08:38 -07:00
Kasim Ahmic
4e775a806d Updates MPS recipes for TE4
The conduit from the MV Capacitor was replaced with a Leadstone Energy Cell Frame. It's only slightly more expensive and will have little to no impact on difficulty.
2014-12-25 17:33:18 -05:00
Ezer Arch
b5ac3a6cfa Update pt_PT.lang
Update last edit time.
2014-12-24 07:04:54 -02:00
Ezer Arch
9a2b2d9361 Update pt_BR.lang
Update last edit time.
2014-12-24 07:04:10 -02:00
EzerArch
eabaf3fc93 Create pt_BR and pt_PT
Add Brazilian and European Portuguese translations.
2014-12-24 06:58:38 -02:00
Ezer Arch
b5ed952f5a Merge pull request #1 from MachineMuse/master
Sync fork with trunk
2014-12-12 01:52:50 -02:00
Claire
ae57415fd1 Merge pull request #535 from Mazdallier/patch-1
Create fr_FR.lang
2014-10-11 14:42:15 -06:00