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
Sergey Popov
4e722eb77c
Add Forestry scoop module with localization
2015-09-08 18:01:27 +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
Xen1290
5096898b90
Merge remote-tracking branch 'MachineMuse/experimental' into experimental
2015-08-30 18:53:58 +02:00
MachineMuse
d6388fd5d5
Merge remote-tracking branch 'origin/experimental' into experimental
2015-08-30 07:56:30 -06:00
MachineMuse
250943aae9
localize nei handler
2015-08-30 07:56:21 -06:00
Claire
11c57969fc
Merge pull request #601 from 3TUSK/patch-1
...
Update zh_CN.lang
2015-08-30 00:19:50 -06:00
Urey.X.
b9ffbddcdc
Update zh_CN.lang
2015-08-30 01:38:57 -04:00
Claire
6dfedcc48c
Merge pull request #596 from Xen1290/experimental
...
Update some information
2015-08-29 14:11:42 -06:00
Xen1290
f490a82407
Update
...
- Fixed logo not loading
- Added some useful information to readme for users
2015-08-29 22:05:55 +02:00
MachineMuse
e17437e1c5
Merge remote-tracking branch 'origin/experimental' into experimental
2015-08-29 13:32:15 -06:00
MachineMuse
1cd51b8ce8
made recipes more robust and fixed auto-extract
2015-08-29 13:31:49 -06:00
Claire
d179beddf8
Merge pull request #595 from Vexatos/patch-2
...
Update de_DE.lang
2015-08-29 12:33:21 -06:00
Vexatos
6dabcd4bff
Update de_DE.lang
2015-08-29 20:29:29 +02:00
Claire
c5797c110b
Merge pull request #593 from Adaptivity/patch-1
...
Update ru_RU.lang
2015-08-29 11:19:28 -06:00
Anton
80e3c7761d
Update ru_RU.lang
2015-08-29 20:17:07 +03:00
MachineMuse
b770400261
add getters back in
2015-08-29 11:14:34 -06:00
MachineMuse
54557e24b9
catching the right Throwable would help
2015-08-29 11:10:50 -06:00
MachineMuse
67d5a23010
another possible workaround for chisel duality
2015-08-29 11:04:13 -06:00
MachineMuse
9763cd546b
trying a different way of having both chisel modules
2015-08-29 10:56:20 -06:00
MachineMuse
1a0a99f3da
add compatibility for new Chisel branch
2015-08-29 10:17:17 -06:00
MachineMuse
1de180f8e4
add try/catch for chisel module
2015-08-29 10:03:32 -06:00
MachineMuse
88e8237cb7
small refactor
2015-08-29 09:25:51 -06:00
MachineMuse
c9c47b6f44
added most gui elements to localization
2015-08-29 08:24:19 -06:00
MachineMuse
ef8d1d7ab8
Moved module descriptions to language files. Now it's up to you, my other-language-speaking friends!
2015-08-29 07:58:17 -06:00
MachineMuse
a30e461066
Fixed binoculars module and added it back in
2015-08-29 07:12:24 -06:00
