Commit graph

814 commits

Author SHA1 Message Date
MachineMuse
1aafb930a9 dynamic ModelPlayer dependency 2013-06-28 14:54:31 -06:00
MachineMuse
764dd1ca0b some tidying and attempt to use flying animation when smartmoving is installed and player is moving quickly 2013-06-28 14:37:27 -06:00
MachineMuse
f7f2bc4ad7 fixed mcmod.info 2013-06-28 10:40:13 -06:00
Claire
d793f7c50d Merge pull request #347 from Andrew2448/localization
Wrote a new file copy method to remove Java 7 dependency.
2013-06-28 08:06:11 -07:00
Andrew2448
226242b6b9 Wrote a new file copy method to remove Java 7 dependency. 2013-06-28 10:38:01 -04:00
Claire
5fbdd66c3e Merge pull request #345 from Andrew2448/localization
Moved lang files, general config, and keybind config to a new location and fixed names not displaying at all.
2013-06-28 05:28:45 -07:00
Andrew2448
3b491a7052 Removed an unused variable. 2013-06-27 23:24:05 -04:00
Andrew2448
23510f9a81 Moved the keybind config to the new location. 2013-06-27 23:19:07 -04:00
Andrew2448
53fe67cf61 Moved the lang files to the resources folder and moved the config to a new location. 2013-06-27 23:13:33 -04:00
MachineMuse
4f0b60b9ba possibly fixed invisibility, night vision, and uphilll step assist 2013-06-27 06:03:53 -06:00
Claire
32425f07bd Merge pull request #341 from Andrew2448/localization
Fixed a massive issue that could invalidate all modules on a player's suit.
2013-06-27 03:01:39 -07:00
Andrew2448
a5d3ad9ce6 Fixed a massive issue that could invalidate all modules on a player's suit. 2013-06-27 01:33:41 -04:00
MachineMuse
2ecf8d3a80 revision bump for smart moving support 2013-06-26 17:58:03 -06:00
MachineMuse
a79835f0cf no longer checks if basic components is installed, just whether the recipes are enabled 2013-06-26 17:45:21 -06:00
MachineMuse
e5b846a689 pushed model rendering into children of parts 2013-06-26 17:06:52 -06:00
MachineMuse
8127ed0011 pushed model rendering into individual model parts 2013-06-25 21:12:10 -06:00
MachineMuse
8129b5547c try with renderplayerapi render() beforehand 2013-06-25 19:12:54 -06:00
Claire
4a568e2744 Merge pull request #339 from Andrew2448/patch-1
Fix fork incompatability (instance vs. INSTANCE)
2013-06-25 16:01:08 -07:00
Andrew2448
4b21b8b4f3 Fix fork incompatability (instance vs. INSTANCE) 2013-06-25 18:57:43 -04:00
Claire
4c4717ea49 Merge pull request #338 from Andrew2448/localization
Added support for localization of blocks, items, and modules.
2013-06-25 15:45:58 -07:00
Andrew2448
da5f4242d1 Finalized localization support. 2013-06-25 18:42:35 -04:00
Andrew2448
1a8ea90bb3 Fix ItemComponent localization. 2013-06-25 14:21:25 -04:00
MachineMuse
79f4f0e8fc sanity check on tessellator in lux capacitor & some tidying 2013-06-25 12:06:13 -06:00
Andrew2448
3e927089f9 Undo some of the previous changes. 2013-06-25 12:56:11 -04:00
MachineMuse
8f4397576f Rebased ArmorModel on ModelPlayer and changed reobf to not use SRG names since it doesn't work with base files (ModelPlayer counts as this unfortunately) 2013-06-25 09:36:14 -06:00
MachineMuse
52f519287c Added modelplayer to build.xml 2013-06-25 09:16:15 -06:00
MachineMuse
b00b051bd9 Added RenderPlayerAPI's ModelPlayer to src tree...hope this works 2013-06-25 09:12:05 -06:00
MachineMuse
b338937626 change instance to INSTANCE for new forge version 2013-06-25 09:06:19 -06:00
Andrew2448
68b8a28103 Some more localization stuff. 2013-06-25 01:11:08 -04:00
Andrew2448
4767976271 Added in en_US localization for basic blocks and items. 2013-06-25 00:25:22 -04:00
Andrew2448
657cd24cc7 Added some background code for localizations. 2013-06-24 23:31:59 -04:00
MachineMuse
349a48b834 fixed reversed matrices 2013-06-23 23:49:20 -06:00
Claire
30b472b144 Merge pull request #336 from Andrew2448/ic2fix
Fix for crashes with people using the latest IC versions. Will be backwards compatible until ICustomElectricItem is removed. Also includes Omniwrench module bugfixes.
2013-06-22 01:25:02 -07:00
Andrew2448
008945ad08 Bugfixes for Omniwrench module. 2013-06-21 16:19:14 -04:00
Andrew2448
781206917c Should fix crashes with people using the latest IC versions.
This will require
https://dl.dropboxusercontent.com/u/66472801/industrialcraft-2-api_1.116.354-lf.zip
to be uploaded to machinemuse.minecraftforge.net to work.
2013-06-21 15:04:55 -04:00
MachineMuse
b93cd68690 fixed syntax confusion 2013-06-15 05:03:31 -06:00
Claire
2557bada7c Merge pull request #325 from jlmwas/fixgl
Explicitly save GL_SCISSOR_TEST to workaround driver bugs
2013-06-15 03:49:00 -07:00
MachineMuse
36965d957d reduced default apiarist armor cost 2013-06-15 04:39:39 -06:00
MachineMuse
46bf295d2f nother framebuffer safety fix 2013-06-15 04:39:01 -06:00
hg
6db8b0b31f Explicitly save GL_SCISSOR_TEST to workaround driver bugs 2013-06-14 13:02:33 -04:00
MachineMuse
681329ee37 axe aoe now only chops blocks that extend BlockLog 2013-06-07 09:16:43 -06:00
MachineMuse
d199e91f09 possible fix for nei chunk boundary issue with thaumic goggles 2013-06-07 09:13:14 -06:00
MachineMuse
75978198ff fix glowbuffer initializer exception 2013-06-07 09:02:24 -06:00
MachineMuse
b34d25d84a revert bad keymanager fix 2013-05-28 01:04:14 -06:00
MachineMuse
9b4df68723 renamed power gauntlet to power fist 2013-05-28 00:26:47 -06:00
MachineMuse
8768e4d4d9 allow conflicting keybinds to save/load 2013-05-28 00:21:07 -06:00
Claire
b21f87da20 Merge pull request #294 from leftyde/master
Fix Gregtech/UE recipes
2013-05-27 18:56:43 -07:00
Martin
2cc918ad23 Update RecipeManager.java
more fixes
2013-05-28 01:21:12 +03:00
Martin
949941c2f3 Update RecipeManager.java
more fixes
2013-05-28 01:15:30 +03:00
Martin
473606d0a5 Update RecipeManager.java 2013-05-27 15:01:30 +02:00