Commit graph

524 commits

Author SHA1 Message Date
MachineMuse
3bd1e4de98 updated to 651 forge and added model files to repo, support tba 2013-04-12 15:54:13 -06:00
MachineMuse
76689377e7 removed unused variables 2013-04-12 14:41:05 -06:00
Claire
19b2ac589a Merge pull request #166 from Andrew2448/master
ok sure whatever
2013-04-11 18:40:54 -07:00
Andrew2448
842dcce398 Migrated the remaining mod specific modules. 2013-04-11 21:37:31 -04:00
Claire
28ee28cd3a Merge pull request #165 from Andrew2448/master
Fix for issue #151 swimassist drains power while boating
2013-04-11 18:04:37 -07:00
Andrew2448
cc6de168b3 Using a more efficient check. 2013-04-11 21:02:18 -04:00
Andrew2448
44d8169b15 Added a check in the SwimAssistModule that stops power drain when in a boat. Fixes #151 2013-04-11 20:57:06 -04:00
Claire
ed3accee35 Merge pull request #164 from Andrew2448/master
Fix for Thermal Expansion recipes and removal of some unnecessary code.
2013-04-11 16:34:42 -07:00
Andrew2448
aed9b1a128 Fix for Thermal Expansion recipes 2013-04-11 19:31:24 -04:00
MachineMuse
97149e71c2 Fix for TE recipe fail 2013-04-11 09:29:02 -06:00
MachineMuse
8f9aa0263d Change build script to use srg obfuscation 2013-04-10 22:27:39 -06:00
MachineMuse
54872c414b initial sound tests 2013-04-10 21:54:20 -06:00
MachineMuse
e65f164e04 Fixed ThermalExpansion recipes 2013-04-10 21:54:19 -06:00
Claire
3be211782a fix gregtech iridium plate oredict entry 2013-04-09 11:16:35 -06:00
Claire
4ceed165b7 Merge pull request #160 from Lyneira/master
Set unlocalized names for power items
2013-04-09 10:13:42 -07:00
Lyneira
5ced120b82 Power tool and armor now set their unlocalized names. Fixes all the power items showing up as "Power Gauntlet" 2013-04-09 17:03:42 +02:00
MachineMuse
5edaf865aa oops a space 2013-04-08 01:23:00 -06:00
MachineMuse
c73af3f0ea file path changes in TE too yeesh 2013-04-08 01:21:14 -06:00
MachineMuse
f909f44248 THANKS FOR CHANGING ALL THE BUILD PATHS AGAIN CALCLAVIA 2013-04-08 01:18:41 -06:00
MachineMuse
ea6ce04de2 couple version bumps 2013-04-08 01:07:14 -06:00
MachineMuse
231c244636 Updated every API (including Forge) and added ThermalExpansion Electric Item support back in 2013-04-08 01:05:38 -06:00
Claire
ee1482f0dd Fix maybe ~ I am a goof 2013-04-07 15:41:23 -06:00
Claire
6da2f8fd07 Fix IC2 electric items crashing the game if IC2 isn't loaded 2013-04-07 15:38:59 -06:00
Claire
cd4119151d Merge pull request #158 from Lyneira/master
Indicate installed modules and hide disallowed modules (unless also installed)
2013-04-07 13:52:17 -07:00
Lyneira
2f80830224 Power armor GUI now indicates installed modules with checkmarks. Config-disallowed modules are hidden from view unless they are installed, then they're displayed with an X, allowing them to be salvaged. 2013-04-07 22:45:46 +02:00
Lyneira
a38d0aee23 Revert "When an item is selected in the power armor GUI, it will now hide modules from view that are disallowed in the config. Disallowed modules that are still installed will still be shown so they can be salvaged."
This reverts commit 5fd0cf50b3.
2013-04-07 17:31:33 +02:00
Lyneira
5fd0cf50b3 When an item is selected in the power armor GUI, it will now hide modules from view that are disallowed in the config. Disallowed modules that are still installed will still be shown so they can be salvaged. 2013-04-07 14:25:54 +02:00
MachineMuse
a06b9e9ff1 Powersuit helm can now act as an oxygen mask (Galacticraft) - tanks sold separately 2013-04-02 16:40:24 -06:00
MachineMuse
66812646df Version bump and deleted extra texture files 2013-04-02 16:03:01 -06:00
MachineMuse
deecfd4647 Added keybinds for cycling modes and config option to turn off mousewheel cycling 2013-04-02 15:52:45 -06:00
MachineMuse
3328caf840 Disabled experimental heat/energy meter render 2013-04-02 14:58:36 -06:00
MachineMuse
2d323a0b8c Made input updates only send when input differs (bandwidth-saving measure) 2013-04-02 14:58:36 -06:00
MachineMuse
904c2faef4 Changed flight control key to be configurable 2013-04-02 14:58:35 -06:00
MachineMuse
0c83cd0a14 Adjusted plasma bolt rendering a bit more 2013-04-02 14:58:34 -06:00
MachineMuse
801e1b75e3 Moved control-oriented classes to control package 2013-04-02 14:58:33 -06:00
MachineMuse
8ae4e8e10b Disabled incomplete modules (blade launcher & sonic weapon) 2013-04-02 14:58:32 -06:00
MachineMuse
c065f2d3bc Added spinning blade entity (WIP) 2013-04-01 02:01:09 -06:00
MachineMuse
ef827e37f0 Moved OGL unrotate to MuseRenderer 2013-03-30 17:55:40 -06:00
MachineMuse
2bc187b15f forge version 608 2013-03-30 16:31:54 -06:00
MachineMuse
e0bf386266 fixed a build script issue 2013-03-30 16:29:36 -06:00
MachineMuse
7abe1f1b4a added incomplete modules to config 2013-03-30 16:29:12 -06:00
MachineMuse
170bb31baa removed unnecessary variable 2013-03-30 16:28:31 -06:00
MachineMuse
83ca84b729 fixed a weird thing in jetpack/boots 2013-03-30 16:28:13 -06:00
MachineMuse
d35b7451ff preliminary work on new modules, WIP 2013-03-30 16:27:02 -06:00
MachineMuse
7175b1bf60 tinkering with plasma to make it look nicer 2013-03-28 02:54:21 -06:00
Claire
bc02e49be5 Merge pull request #139 from Andrew2448/master
Migrated all of the remaining Config.java modules :D
2013-03-27 18:59:30 -07:00
Andrew2448
761c08ca73 Migrated the last of the Config.java modules \o/ 2013-03-27 21:54:36 -04:00
Andrew2448
a93483aa87 Migrated more modules 2013-03-27 21:36:32 -04:00
Claire
d8c73355c3 Merge pull request #134 from nallar/master
Performance improvements, simplifications and bug fixes.
2013-03-24 19:20:18 -07:00
MachineMuse
1c56d920a5 added necessary include file 2013-03-24 20:08:15 -06:00