Commit graph

1022 commits

Author SHA1 Message Date
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
Claire
c24fe51a28 Merge pull request #534 from lirannl/patch-2
Rename he_IL to he_IL.lang
2014-10-11 14:40:32 -06:00
Mazdallier
0187f3d7ef Create fr_FR.lang 2014-10-07 10:58:07 +02:00
Liran
9f2e2f3939 Rename he_IL to he_IL.lang
I forgot the .lang extension!
2014-10-04 08:54:15 +03:00
Claire
c4faacf219 Merge pull request #530 from lirannl/patch-1
Create he_IL
2014-10-01 07:13:45 -06:00
Liran
d53010a874 Update he_IL 2014-09-21 12:56:24 +03:00
Liran
e4d768157e Create he_IL
There's no Hebrew translation for Railgun, so I just tried my best to describe it's functionality, direct weapon.
Neither do Jetpacks have a Hebrew translation. Again, I'll just explain the functionality. Back thruster- is what I came up with.
2014-09-15 17:40:20 +03:00
MachineMuse
1f5e93a1f9 attempt to fix cofhcore dependency 2014-09-13 16:28:46 -06:00
MachineMuse
e9696fb23f fix toggle send to all 2014-09-13 16:21:37 -06:00
MachineMuse
6d27408b50 updated galacticraft breathable helmet 2014-09-11 08:33:13 -06:00
Claire
71502e6c35 Merge pull request #517 from Adaptivity/patch-2
Update pack.mcmeta
2014-09-10 15:09:08 -06:00
Claire
f97a2569bf Merge pull request #515 from Adaptivity/patch-1
Create ru_RU.lang
2014-09-10 15:07:17 -06:00
MachineMuse
c6e946f9ce fixed IRevealer reference 2014-09-10 13:42:37 -06:00
MachineMuse
ae1702aadb changed things back to classes so interface stripping can work 2014-09-10 13:27:12 -06:00
MachineMuse
b79ced3f12 added interface stripping for IRevealer 2014-09-10 13:23:12 -06:00
MachineMuse
8621c727ef thaumcraft goggle node revealer added 2014-09-10 13:13:04 -06:00
MachineMuse
0dfbe42d80 thaumcraft goggle support restored (probably) 2014-09-10 13:04:37 -06:00
MachineMuse
732bba5146 fixed graphical meters 2014-09-10 12:03:39 -06:00
Anton
2f2b8193fc Update pack.mcmeta
Languages shouldn't be here. Check any mod, for example https://github.com/SlimeKnights/TinkersConstruct/blob/master/resources/pack.mcmeta
2014-09-10 15:27:48 +04:00
Anton
4105325981 Create ru_RU.lang 2014-09-10 15:07:49 +04:00
MachineMuse
bb837e5325 added keybind to embedded numina_at.cfg 2014-09-09 19:00:15 -06:00