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
Claire
3cde43f643
Merge pull request #624 from sfchipan/patch-2
...
update zh_CN.lang to #279
2015-09-09 14:16:06 -06:00
SF_Chipan
5583d7a9f2
update zh_CN.lang to #279
2015-09-09 14:20:02 +08:00
MachineMuse
b426fdfc4e
more tootlip localization
2015-09-08 23:56:47 -06:00
MachineMuse
c7be212132
update ru_RU.lang
2015-09-08 12:40:23 -06:00
MachineMuse
c1a09cdbad
Merge remote-tracking branch 'origin/experimental' into experimental
...
Conflicts:
src/main/resources/assets/powersuits/lang/ru_RU.lang
2015-09-08 12:38:25 -06:00
MachineMuse
c94142580e
added default implementation of getDescription so it can be safely omitted from new modules
2015-09-08 12:36:11 -06:00
MachineMuse
dc200d360d
added knockback resistance to armor, idk
2015-09-08 12:29:29 -06:00
MachineMuse
8077ab9d58
Merge branch 'Pinkbyte-forestry-scoop-new' into experimental
2015-09-08 12:28:21 -06:00
MachineMuse
0d0c2550f2
Merge branch 'forestry-scoop-new' of https://github.com/Pinkbyte/MachineMusePowersuits into Pinkbyte-forestry-scoop-new
2015-09-08 12:27:30 -06:00
Claire
f8838bd260
Merge pull request #620 from Adaptivity/patch-1
...
Update ru_RU.lang
2015-09-08 12:15:31 -06:00
Sergey Popov
4e722eb77c
Add Forestry scoop module with localization
2015-09-08 18:01:27 +03:00
Anton
696601e24e
Update ru_RU.lang
2015-09-08 17:59:19 +03:00
MachineMuse
603f735217
deleted some unused classes
2015-09-08 03:08:49 -06:00
MachineMuse
b5fe074b3d
Keybinding HUD rework
2015-09-08 02:31:34 -06:00
MachineMuse
784dde9caa
Plasma bolts will no longer hit the shooter. Ever.
2015-09-07 23:40:34 -06:00
MachineMuse
24d220d532
added half-second cooldown to railgun and reduced the default heat generation
2015-09-07 21:36:24 -06:00
MachineMuse
e0404d8bc5
add weight capacity to auto-populating of config
2015-09-07 18:18:17 -06:00
MachineMuse
b11f4e71c8
Changed detailed summary frame to summarize all equipped items & fix overlapping text issues in detailed summary & module tweak frames
2015-09-07 17:07:34 -06:00
MachineMuse
57bf818dde
add weight capacity to config
2015-09-07 17:03:30 -06:00
MachineMuse
f6ddf171a4
fix enderIO capacitor recipes
2015-09-07 15:32:52 -06:00
MachineMuse
4c4bfb2975
add mod-specific modules to localization
2015-09-07 15:08:09 -06:00
MachineMuse
bc6e9f920c
ripped off omniwrench code for wrench functionality
2015-09-07 14:57:34 -06:00
MachineMuse
c1d044c28d
fix clickability of arrows on scrollable frame
2015-09-07 14:19:58 -06:00
MachineMuse
a612231f26
Merge remote-tracking branch 'origin/experimental' into experimental
2015-09-01 15:45:13 -06:00
MachineMuse
4f74351511
added sidedness & sound setting checking anywhere sounds are played
2015-09-01 15:45:05 -06:00
Claire
1e20dcc8ed
Merge pull request #609 from AegisLesha/patch-1
...
Update fr_FR.lang
2015-08-31 17:21:48 -06:00
Jean-Marie
6ade85e605
Update fr_FR.lang
...
Not sure if 'JSON Shaped' needs a translation.
Also, in my opinion, some translations aren't accurate, but since it's Mazdallier's ones, I prefer not to change them.
2015-08-31 16:19:29 +02:00
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
