Commit Graph
102 Commits
Author SHA1 Message Date
Martin Robertz 47a5b9391a sa+wci 2023-09-24 22:57:55 +02:00
miozuneGitHub GTNH Actionsgithub-actions[bot]
69bb974420 Use compileOnlyApi for CoFH (#84)
* Use compileOnlyApi for CoFH

* spotlessApply (#85)

Co-authored-by: GitHub GTNH Actions <>

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-05-15 08:07:18 +02:00
Jason Mitchell 84c2239244 [ci skip] spotlessApply with the new settings 2023-01-28 18:04:28 -08:00
Alexdoru c370ce93d5 iterate over Map.entrySet() rather than Map.keyset() and use get() on each iteration 2023-01-28 18:02:41 -08:00
Alexdoru 83f54f1e97 quick fixes : enhanced for loop 2023-01-28 18:02:41 -08:00
Alexdoru 2b6b01314d quick fix : Unused assignment 2023-01-28 18:02:41 -08:00
Alexdoru 67c8b53cf1 quick fix : Unnecessary 'continue' statement 2023-01-28 18:02:41 -08:00
Alexdoru 2d13e6185e quick fix : Redundant type cast 2023-01-28 18:02:41 -08:00
Alexdoru 9cfd723ea3 quick fix : Raw use of parameterized class 2023-01-28 18:02:41 -08:00
Alexdoru f384a4fe28 quick fix : Redundant 'if' statement 2023-01-28 18:02:41 -08:00
Alexdoru fc54dde7ce quick fix : 'if' statement with identical branches 2023-01-28 18:02:41 -08:00
Alexdoru 60f7add07f quick fix : Explicit type can be replaced with <> 2023-01-28 18:02:41 -08:00
Alexdoru d6b69264b9 quick fix : Unnecessary boxing / unboxing 2023-01-28 18:02:41 -08:00
Alexdoru 825643a7c4 quick fix : C-style array declaration 2023-01-28 18:02:41 -08:00
Raven Szewczyk 39be06c23b Fix JABBA-related issues with crafting station slots (#54)
* Fix shift-merging tools voiding items

fixes <https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/11392>

* Change 0-sized ItemStacks into null stacks in crafting station attached slots

Fixes <https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/10425>

* Update buildscript

* spotlessApply
2022-09-22 20:51:23 +02:00
Bernhard Bonigl 60af741b46 Fix armor without NBT crashing #1328 2015-01-14 23:39:11 +01:00
Adaptivity 435be0e314 Localization for modifiers 2015-01-05 15:13:19 +03:00
Bernhard Bonigl cacd93bf1a Fix reinforced MODIFIER display in the GUI getting overwritten by other modifiers 2015-01-03 18:37:03 +01:00
Bernhard Bonigl e47b570915 Merge branch 'master' into experimental 2014-11-26 22:37:25 +01:00
Bernhard Bonigl b861a114ca Allow Thaumometers to be added to travellers goggles.
1 Thaumometer = see nodes
2 Thaumometers = like the goggles of revealing
You can upgrade from 1 to 2 thaumometers.
2014-11-26 20:57:08 +01:00
Bernhard Bonigl 7372d0af89 Change quartz to be less effective on projectiles 2014-11-18 19:40:23 +01:00
Bernhard Bonigl 6d9dc59f0f Fix damage for arrows/bolts not being displayed in stations 2014-11-16 21:21:39 +01:00
Bernhard Bonigl 911755bef7 Change windup-modifier to not allow going below 0.25 (was possible if the last application was more) 2014-11-16 21:08:06 +01:00
Bernhard Bonigl 2618ebba3c Allow all materials for restocking for shuriken 2014-10-26 20:50:04 +01:00
Bernhard Bonigl 98d3cc8dc1 We can now restock ammo stuff. yay. 2014-10-26 20:38:28 +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 f027de5ab9 Config option to disable the flux modifier battery restriction in case ti's needed somewhere. (Looking at you there, HQM Maps.) 2014-10-25 18:51:38 +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 f734169ad6 Flux modifier now requires the tool to have at least charge/1000 durability for the battery to be applicable. 2014-10-24 11:52:19 +02:00
Bernhard Bonigl cb33bb1b72 Fix flux modifier throwing errors 2014-10-19 17:34:16 +02:00
Bernhard Bonigl f31e41447c Merge branch 'master' into weaponry
Conflicts:
	src/main/java/tconstruct/items/tools/Arrow.java
	src/main/java/tconstruct/tools/TinkerTools.java
2014-10-19 14:12:50 +02:00
Bernhard Bonigl c6e24f8511 Fix Traveller Gear Repair #1093 2014-10-18 17:16:50 +02:00
Bernhard Bonigl 62905da392 Crossbow Modifier Graphics \o/ 2014-10-17 01:03:53 +02:00
Bernhard Bonigl 3427ed6208 Redstone-Modifier for bows and similar! 2014-10-09 17:35:49 +02:00
Bernhard Bonigl 03755be47d Fix Armor-Moss-Modifier not updating display, so people stop complaining about it not working. 2014-10-05 12:18:21 +02:00
Bernhard Bonigl 1cd4f214ff Make modifiers only applicable to their valid types. Fix some inconsistencies with that. Might possibly contain bugs still. 2014-09-24 00:47:06 +02:00
Bernhard Bonigl 25261243b0 Change the damage display stuff to use NBT instead of the internal damage stuff, so we can make setItemDamage compatible with the NBT durability we use. 2014-09-20 14:09:59 +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
Zach fbf7720a05 remove println
Cherry-picked from 3f10d07849d3324a87a297fcc7bed5b63ac00e20
2014-08-28 01:28:03 -07: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 8959a70387 Fix some armor modifiers being applicable to everything, crashing the game. #885 2014-08-21 21:42:44 +02:00
Bernhard Bonigl 1e4afd6922 Try to obtain Flux-Transfer-Rates on fully charged/completely empty batteries to prevent distorted results. 2014-08-16 16:44:54 +02:00
Bernhard Bonigl 02de82951d Allow upgrading the Flux-Modifier, if the new battery is bigger 2014-08-08 12:58:29 +02:00
Bernhard Bonigl 820b13e106 Flux modifier now uses the properties of the battery that was added. (Max-Energy and transfer rates) 2014-08-08 11:13:48 +02:00
61352151511 223098bd0c Remove Unused Imports 2014-08-04 19:29:38 -03:00
Bernhard Bonigl 527934d277 Bugfix: It was possible to add more than <maxamount> to redstone/lapis/... modifiers if they were exactly at a lvlup threshold 2014-07-30 13:31:13 +02:00
Bernhard Bonigl f6877b55cb Bugfix: Blaze modifier didn't stack its levels properly. Broke after 1st level because it only checked for it's first maximum. 2014-07-30 12:54:16 +02:00
mDiyo 1affd6d909 Merge pull request #724 from squeek502/1.7.10-merge-1.6.4
Merge some unmerged pull requests from 1.6.4 branch
2014-07-12 10:01:35 -08:00
mDiyo ac50689102 Multibugfix 2014-07-06 22:59:44 -08:00