Commit graph

735 commits

Author SHA1 Message Date
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
MachineMuse
e2d84f4765 Took afterdeps back out 2013-05-26 23:42:48 -06:00
MachineMuse
e52a13d8dc change required forge version 2013-05-26 22:14:58 -06:00
MachineMuse
74c981db80 added first person arm render 2013-05-23 05:29:42 -06:00
MachineMuse
4de6e2c091 moved keybind readin to postinit 2013-05-22 20:15:01 -06:00
MachineMuse
540beb8480 fix a boolderp 2013-05-22 18:55:35 -06:00
MachineMuse
716dae3fac put a popattrib back in after disabling culling 2013-05-21 22:37:53 -06:00
MachineMuse
b71456f607 added depth test to power tool render flags 2013-05-20 19:08:11 -06:00
MachineMuse
8001699495 moved all textures to stack-based system 2013-05-20 19:04:56 -06:00
MachineMuse
dd1ff05c9f fix gregtech recipes (again) 2013-05-20 16:43:36 -06:00
MachineMuse
483192697f stop people from removing all colours 2013-05-20 03:40:08 -06:00
MachineMuse
2033586390 small render tweaks 2013-05-18 19:56:09 -06:00
MachineMuse
a866afa628 change texture binding to use pushTexture wherever possible 2013-05-18 18:39:37 -06:00
MachineMuse
8db5470084 fix first person rendering for new forge version 2013-05-18 17:14:41 -06:00
MachineMuse
3f8d3c57e8 fix for fast graphics screen black 2013-05-18 16:24:51 -06:00
MachineMuse
ad77d418b4 Changed packet handler to not use lambdas for now (concurrency issue) 2013-05-18 16:07:33 -06:00
MachineMuse
70235bf129 possible fix for omniwrench rotation issue 2013-05-16 23:30:28 -06:00
MachineMuse
505a0427e0 better glsl usage and added default config options 2013-05-16 23:15:06 -06:00
MachineMuse
016925f507 safety checks on shaders & unified format 2013-05-16 22:52:45 -06:00
MachineMuse
9a520fbe2c get thaumcraft api from alternate host? 2013-05-16 11:05:41 -06:00
MachineMuse
d43850e804 behold the future of glowy shit in minecraft 2013-05-16 10:58:09 -06:00
MachineMuse
ed34f3ae7d Initial glow effect and random other stuff, incomplete and bad do not use 2013-05-15 23:51:10 -06:00
MachineMuse
999bf4b71c fixed small crash case for empty nbt tags 2013-05-15 22:48:11 -06:00
MachineMuse
caf7d8fe00 Merge branch 'master' of https://github.com/MachineMuse/MachineMusePowersuits 2013-05-15 15:56:56 -06:00
MachineMuse
2fe90080af drain electricity from top of inventory instead of bottom 2013-05-15 15:55:12 -06:00
MachineMuse
0b114b258f fix lux capacitor block bounds 2013-05-15 00:21:53 -06:00
MachineMuse
862ec32906 use forge 700 2013-05-14 17:13:13 -06:00
MachineMuse
80aa75d3b7 changed more things to use scissors test, should make text look better in scrollable frames. 2013-05-14 17:11:39 -06:00
MachineMuse
8e3488c4dd transitioned render tick handler to use scissors test instead of weird inefficient partial icon drawing stuff 2013-05-14 16:56:57 -06:00
MachineMuse
1a67d392b9 safety check on omniwrench module 2013-05-14 11:27:53 -06:00