Commit graph

718 commits

Author SHA1 Message Date
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
MachineMuse
de920767ab safety wrapper on extra variable types for packets 2013-05-14 11:09:57 -06:00
MachineMuse
135a8f1f1b added packet to overwrite client-side config settings when connecting 2013-05-12 20:16:12 -06:00
MachineMuse
ac46bbf5c2 sidedness fix 2013-05-09 00:50:38 -06:00
MachineMuse
ac9092c8e6 Merge branch 'master' of https://github.com/MachineMuse/MachineMusePowersuits 2013-05-09 00:27:55 -06:00
MachineMuse
096af67ed9 enhanced build.xml to show required forge version 2013-05-09 00:24:05 -06:00
MachineMuse
78c01a6a4a converted packet management to more robust scala-oriented design 2013-05-09 00:23:31 -06:00
Claire
e27b5de285 Merge pull request #238 from Andrew2448/heattweaks
Removed an unnecessary step from the cooling algorithm and added a littl...
2013-05-08 18:18:38 -07:00
Claire
2e698a2648 Merge pull request #252 from Andrew2448/master
Added a config option for sounds.
2013-05-08 17:18:19 -07:00
Andrew2448
cca74f55c5 Added a config option for sounds. 2013-05-08 20:11:36 -04:00
MachineMuse
4889a7889d possible fix for nullpointer in colour packet 2013-05-08 12:17:29 -06:00
MachineMuse
e35a7f7efd added jetpack model 2013-05-07 11:37:12 -06:00
MachineMuse
b7ec31ba32 added textures WHOOPS 2013-05-07 06:46:11 -06:00
MachineMuse
6beeeb7093 disabled transparent armor as well since it's now on the cosmetic screen 2013-05-06 14:54:18 -06:00
MachineMuse
56c4e219cc colours now decrement accordingly when one is removed 2013-05-06 14:49:44 -06:00
MachineMuse
4bfecdec03 colour picker working roughly as intended 2013-05-06 14:14:41 -06:00
MachineMuse
537e194604 better colour picker behaviour...still not perfect 2013-05-06 13:49:22 -06:00
MachineMuse
408e76aa7a preliminary colour picker behaviour 2013-05-06 10:01:00 -06:00