Commit Graph
204 Commits
Author SHA1 Message Date
Bernhard Bonigl cd4206df72 Fix blending getting disabled by liquid block drawing (looking at you, slimepads) 2015-01-18 19:40:04 +01:00
Bernhard Bonigl 1a18389825 Pull hardcoded localizations stuff from books into .lang files, so we have at least one hacky way to have everything localized in the books. #1268 2015-01-01 23:13:47 +01:00
Bernhard Bonigl a1bde95c36 Merge branch 'master' into experimental 2014-12-04 19:26:11 +01:00
Bernhard Bonigl c4d9ebd505 Add a possibly missing rendering state reset 2014-12-02 21:03:01 +01:00
TheTemporatlist 5f725cb971 Fixed possible NPE 2014-11-28 13:26:32 -05:00
Bernhard Bonigl c42f99cba7 Merge branch 'master' into weaponry
Conflicts:
	.gitignore
	build.properties
2014-11-15 23:17:27 +01:00
boni 8ba9eea615 Merge pull request #1161 from TheTemportalist/master
Fix NEK integration without NEK
2014-11-14 01:18:00 +01:00
TheTemporatlist c54250bd47 Should fix the crash in the control screen. The armor class wouldnt compile correctly because it couldnt find the event class for NEK 2014-11-13 12:26:45 -05:00
Bernhard Bonigl 5b2f1f5678 Render liquid colors in tanks. Alpha not possible without complete rewrite. 2014-11-13 16:51:25 +01:00
TheTemporatlist fc264ccae9 YAYY. ITS WORKING!
Removed debug code and fixed the things
2014-11-11 17:53:42 -05:00
TheTemporatlist f410c0bd6b Temporary Debug code 2014-11-11 17:30:54 -05:00
TheTemporatlist 514e2e6a0e I missed these 2014-11-11 17:04:18 -05:00
TheTemporatlist 6fa032fe2d Patching compatibility 2014-11-11 17:01:15 -05:00
TheTemporatlist fb59d7c244 I forgot to register with NEK 2014-11-11 16:13:40 -05:00
TheTemporatlist 6b62ea3813 Function missed 2014-11-10 18:49:54 -05:00
TheTemporatlist fc2975b4d3 Formatting fixes 2014-11-10 18:47:15 -05:00
TheTemporatlist 8a0092e147 This should be valid for NEK integration. 2014-11-10 18:37:27 -05:00
Bernhard Bonigl 28a4dfe478 Take fluid color into account for liquid rendering #1150 2014-11-10 20:05:12 +01:00
Bernhard Bonigl 6cd7b497e8 Weaponry booooooook 2014-10-29 22:33:00 +01:00
Bernhard Bonigl dc1ecab768 Arrows with knockback :D:D 2014-10-26 18:50:50 +01:00
Bernhard Bonigl 947da8f9df Merge branch 'master' into weaponry
Conflicts:
	src/main/java/tconstruct/tools/ToolProxyClient.java
2014-10-26 17:10:09 +01:00
Bernhard Bonigl 5905653f80 Fix build from PR 2014-10-26 16:32:35 +01:00
boni 20e295123c Merge pull request #1100 from crafteverywhere/master
Make the manuals translatable.
2014-10-25 18:53:12 +02:00
Bernhard Bonigl 4c1852546e ToolStation/Forge GUI for the new weapons 2014-10-24 14:58:27 +02:00
crafteverywhere 79b0d6e8c7 Update TProxyClient.java 2014-10-23 07:19:01 +08:00
crafteverywhere 50a485b14d Add null check for each manual and change the localtions of pics. 2014-10-23 07:15:22 +08:00
Bernhard Bonigl dbc446636f Rework dagger into a projectileBase entity! 2014-10-22 23:42:08 +02:00
Bernhard Bonigl 46059d6913 Merge branch 'master' into weaponry 2014-10-22 23:05:45 +02:00
Bernhard Bonigl 8b154ea1b9 Register belt/goggle packets. You can actually deactivate goggles now, wooooo 2014-10-22 23:03:34 +02:00
Bernhard Bonigl 9f64ef46e8 Projectile Weapons tooltip displays the max damage with the current ammo 2014-10-19 16:49:04 +02:00
crafteverywhere 7565c83441 Indent code in an accepted style. 2014-10-19 05:41:20 +08:00
crafteverywhere fb4c0ddf9e make the manuals translatable. 2014-10-19 05:37:19 +08:00
Bernhard Bonigl 17593a3909 Reimplement the changes to the entity rendering in the custom renderers so their animations n stuff isn't b0rked anymore. (todo: do properly later) 2014-10-10 17:52:17 +02:00
Bernhard Bonigl 69fad3c103 Fix entity rendering, but screw up all the animations n stuff.. sigh 2014-10-10 17:37:39 +02:00
Bernhard Bonigl 0bdf31912b Lots of integration. Graphics n stuff. Items. Everything. 2014-10-05 20:46:12 +02:00
Tonius bd30b65475 Fixed tool rendering breaking scoreboard and player list rendering 2014-10-03 20:55:14 +02:00
Bernhard Bonigl e658348383 Fix the rendering issues in the manual caused by tool rendering 2014-09-29 09:11:38 +02:00
Bernhard Bonigl 1f0b88b822 Fix colors 2014-09-26 17:15:33 +02:00
Bernhard Bonigl cb3742ccbf Fix enchanted items messing up the rendering of tools in inventories 2014-09-26 16:49:39 +02:00
Qowyn 6d4738d2b7 Getting rid of NewContainerGui 2014-09-23 23:34:30 +02:00
boni 518de71cac Merge pull request #1015 from radfast/master
Inventory tabs - improve appearance of unselected tab.
2014-09-23 19:15:09 +02:00
radfast 18343a71e5 Inventory tabs - improve appearance of unselected tab. 2014-09-23 18:01:13 +01:00
Qowyn 1ccb8a99a4 Prevent mouse position reset, just inform the server that we are changing the gui 2014-09-23 16:42:01 +02:00
Qowyn 8d77ab5916 Move TabRegistry initialization to TinkerArmor 2014-09-23 16:33:22 +02:00
Bernhard Bonigl 8e0bfdd0ed Fix entities/weapons in hand not using the color modifier 2014-09-22 15:51:55 +02:00
Mitchell Petrie f093c3da17 Fix OpenGL blend state causing dark inventory slots. 2014-09-14 17:43:24 -04:00
Arthur Uzulin 3d028e7123 Made battlesigns have editable text 2014-09-12 23:59:13 +10:00
radfast 67fe457257 Fix knapsack tab rendering. Courtesy to @radfast 2014-09-10 11:24:51 +02:00
Bernhard Bonigl 2755884288 Stealth Modifier description and armor modifier recipe fixes. 2014-09-10 00:08:57 +02:00
Bernhard Bonigl 26de0a42b5 Add armor modifiers rendering in books. 2014-09-09 23:54:54 +02:00