Commit Graph
18 Commits
Author SHA1 Message Date
Bernhard Bonigl 5495722194 Pull tool info stuff out from toolstation/craftingstation gui and unify in helper class 2014-10-28 15:45:13 +01: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 3427ed6208 Redstone-Modifier for bows and similar! 2014-10-09 17:35:49 +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 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
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 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
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 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
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