Commit Graph
37 Commits
Author SHA1 Message Date
Bernhard Bonigl 4c1852546e ToolStation/Forge GUI for the new weapons 2014-10-24 14:58:27 +02:00
Bernhard Bonigl 5bfdb0d769 Rework stencil table button layout to weaponry and more NEI fix 2014-10-24 13:30:46 +02:00
Bernhard Bonigl 939bd8a0ae Merge branch 'master' into weaponry
Conflicts:
	src/main/java/tconstruct/tools/TinkerTools.java
2014-10-24 13:17:48 +02:00
Bernhard Bonigl 1a486bb38e Fix localization not working in ToolForge 2014-10-24 12:03:50 +02:00
Bernhard Bonigl b9efa7373f Change stencils to be identified by actual IDs because DAMN was that other stuff a pain to use if you wanted to identify one. 2014-10-23 00:14:27 +02:00
Bernhard Bonigl 46059d6913 Merge branch 'master' into weaponry 2014-10-22 23:05:45 +02:00
Bernhard Bonigl ffcd7f26b4 Step 1: Give @TheVikingWarrior an example of how to translate toolstation tool descriptions 2014-10-22 22:22:00 +02:00
Bernhard Bonigl 514847a10d NEI Support for right side of stencil table 2014-10-22 20:31:35 +02:00
Bernhard Bonigl 3427ed6208 Redstone-Modifier for bows and similar! 2014-10-09 17:35:49 +02:00
Qowyn d92b0add32 Support for NEI crafting overlay in crafting station with attached chest. 2014-10-05 22:05:48 +02:00
Qowyn 2ab8f69de8 underp CraftingStationGui with chest(s) attached 2014-09-25 13:26:05 +02:00
Qowyn 11039c9f2d Make CraftingStationGui show material info too, display default text for all other items. Cache information like the part builder does. 2014-09-24 18:08:22 +02:00
Qowyn fab22bd432 Adaptive NEI Visibility based on screen size + crash prevention for default NEI layout.
Conflicts:
	src/main/java/tconstruct/tools/gui/CraftingStationGui.java
2014-09-24 16:17:58 +02:00
Bernhard Bonigl 16fd95d3a2 Tinker Table displays stats of tool in center slot 2014-09-24 11:55:59 +02:00
Bernhard Bonigl 1d4ca5c453 Port ToolStation armor/accessory display stuff to CraftingStation (oh god this is a mess. do it properly in 1.8) 2014-09-24 11:46:25 +02:00
Bernhard Bonigl c38a249a6d Display Armor/Accessories correctly in toolstations/forges 2014-09-24 11:39:56 +02:00
Qowyn 7240573e3a NEI Support for PartCrafterGui and CraftingStationGui 2014-09-24 02:15:56 +02:00
Qowyn 6d4738d2b7 Getting rid of NewContainerGui 2014-09-23 23:34:30 +02:00
Arthur Uzulin 3d028e7123 Made battlesigns have editable text 2014-09-12 23:59:13 +10:00
Arthur Uzulin 80efde613a The return of achievements
- Re-added achievements
- Organised all imports (seemed all over the place)
- Formatted all code (seemed very combined, used the TinkerStyle)
2014-09-09 18:30:15 +10:00
Bernhard Bonigl 568ed09982 Localize tool names 2014-09-01 23:52:04 +02:00
Bernhard Bonigl 4c410e6de6 Localize material names and move the display-prefix to language files 2014-09-01 22:40:00 +02:00
Bernhard Bonigl 6e9dea9bd8 Localization cleanup/fixes 2014-09-01 22:19:43 +02:00
Bernhard Bonigl ed90124e98 StencilTable: Fix derpyness with stencil saving and free toolrod-stencil with empty stencil table. 2014-08-29 14:44:45 +02:00
Bernhard Bonigl 2dd426f1d7 Unify tool speed calculation in one accessible place, instead of having the same code floating around 3 times. 2014-08-28 14:29:12 +02:00
Bernhard Bonigl 7ca3acad88 Fix speed calc in GUI from #934
Unmerged 1.6.4 commit: Multiple bugfixes #927
2014-08-28 14:29:08 +02:00
mDiyo 5b56d5e392 Buff redstone mod, refactor broad tools to match
Cherry-picked from 34a4c8c80f969cafd696b41d963c2a041347d4cd

Conflicts:
	src/main/java/tconstruct/common/TProxyCommon.java
	src/main/java/tconstruct/items/tools/Excavator.java
	src/main/java/tconstruct/items/tools/Hammer.java
	src/main/java/tconstruct/items/tools/LumberAxe.java
	src/main/java/tconstruct/library/tools/HarvestTool.java
	src/main/java/tconstruct/modifiers/tools/ModLapis.java
	src/main/java/tconstruct/modifiers/tools/ModRedstone.java
	src/main/java/tconstruct/tools/gui/ToolStationGui.java
2014-08-28 01:27:39 -07:00
Bernhard Bonigl 64d6638175 Fix StencilTable always creating a wooden tool rod until button is pressed 2014-08-24 23:09:49 +02:00
mDiyo b1e30d8ab8 Merge pull request #892 from bonii-xx/new_pr2
Rework Stencil Table
2014-08-21 06:25:56 -08:00
Bernhard Bonigl 85c866af64 Fix ToolStation rendering 2014-08-20 22:31:52 +02:00
Bernhard Bonigl bd997ab05e Rework stencil table GUI 2014-08-20 22:23:12 +02:00
Bernhard Bonigl 5dd0e0c8fa Change StencilTable from hardcoded patterns to a flexible system 2014-08-20 19:15:16 +02:00
Bernhard Bonigl 258b980605 Unify harvestlevel strings through the library. Also makes them adaptable. 2014-08-20 17:39:54 +02:00
mDiyo d891a26250 Finish controls on travel gear 2014-07-21 12:52:39 -08:00
Glassmaker ea12d67f9c Fixed items dropping while clicking chest inventory in crafting station/tinkers table, and display order for large chests, closes #698 2014-07-14 23:56:41 +03:00
squeek d719885de7 Fixed some inconsistencies in how damage/speed of tools is calculated in GUIs
* Fixed damage not being calculated properly in Crafting Stations
 * Fixed Crafting Stations stonebound speed calculations (they were using a different algorithm)
 * Fixed typo that made GUIs show the primary mining speed of dual harvest twice
 * Fixed Stonebound damage bonus/loss always being truncated to an int in GUIs

Conflicts:
	src/main/java/tconstruct/tools/gui/CraftingStationGui.java
	src/main/java/tconstruct/tools/gui/ToolStationGui.java
2014-07-06 23:53:35 -07:00
mDiyo 2629e241cd Finish updating slot logic for Tool Stations, fix dupe bugs 2014-07-05 21:08:58 -08:00