upstream/TinkersConstruct
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/TinkersConstruct.git synced 2026-11-13 17:04:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,477 Commits 6 Branches 324 Tags
937c322dd311b18aa990dccdcf85df4dc0f87e52
Commit Graph
244 Commits
Author SHA1 Message Date
くぁーりぃandMaya d6d7a699fd Fluids use still texture as fallback when flowing texture is missing (#168) 
Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com>
 2025-04-19 15:31:07 +00:00
YannickMG 4428831149 Don't register manual book data if dreamcraft is loaded. 2024-01-28 15:51:08 +01:00
YannickMG 6e3295fc4d Translate all tool parts 2024-01-19 18:33:25 +01:00
ah-OOG-ah c67546fc50 Patch for Angelica (#101) 
* Patch for Angelica

* Update BlockSkinRenderHelper.java
 2023-11-26 19:30:47 -08:00
charagarlnad 11179e43e6 fix health bar not being shifted up by DualHotbar (#98) 2023-10-10 21:41:11 +02:00
Martin Robertz 8bb6f7b0e2 fix wci+deps 2023-09-25 00:43:14 +02:00
Martin Robertz 3ef4a5e259 sa 2023-09-25 00:17:50 +02:00
Martin Robertz 265fc8cc15 missing imports 2023-09-25 00:12:38 +02:00
Martin Robertz 47a5b9391a sa+wci 2023-09-24 22:57:55 +02:00
Alexdoru 098783fa1e Fix health bar renderer (#97) 
* delete unused locals

* add some code that has been forgotten when copying and overriding the vanilla renderHealth method

* create dedicated class HealthBarRenderer extending Gui to stop copy-pasting certain vanilla methods

* fix renegeration hearts moving when the game is paused

* only bind tinkers hearts textures if it's actually going to draw tinkers' hearts

* stop drawing vanilla hearts when they are hidden by tinkers' heart being drawn on top

* fix tinker's half heart not moving with regeneration

* fix drawing all tinkers' hearts on top of each others, and now only draw the top most hearts

* add comment to help with debugging
 2023-09-24 19:31:03 +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
Alexdoru 531e33765e cache some Loader.isModLoaded calls (#72) 2023-02-08 21:11:39 +01:00
Jason Mitchell 84c2239244 [ci skip] spotlessApply with the new settings 2023-01-28 18:04:28 -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 cdc7dcf5d0 quick fix : optimize imports 2023-01-28 18:02:41 -08:00
Alexdoru ae363450b1 quick fix : Private field may be 'final' 2023-01-28 18:02:41 -08:00
Alexdoru 983ca22d97 spotless 2023-01-28 18:02:41 -08:00
Alexdoru 379d0cb168 quick fix : Too weak variable type leads to unnecessary cast 2023-01-28 18:02:41 -08:00
Alexdoru 2d13e6185e quick fix : Redundant type cast 2023-01-28 18:02:41 -08:00
Alexdoru 114fce2770 quick fix : Duplicate branches in 'switch' 2023-01-28 18:02:41 -08:00
Alexdoru f446ea280f quick fix : Condition is covered by further condition 2023-01-28 18:02:41 -08:00
Alexdoru 3a2b50acd5 quick fix : Renamed catch block parameter to ignored 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 66bf122138 keybinds (#67) 
* unbind keybinds by default

* spotless
 2023-01-27 20:33:01 +01: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
Alexdoru 13a9ebee65 fix bug where it triggers key actions when you have keybinds set to none (#51) 
* format ArmorControls.java

* return value not used

* don't need to check keybinds for mouse input

* used the Keybind class properly to stop triggering key actions when keys are not binded
 2022-09-01 11:33:00 +02:00
David Lindström 69aab3eabe Formatting fix 2020-09-04 00:55:33 +02:00
David Lindström 996d9adb48 Add support for binding a key to toggle the Travellers Belt toolbar in inventories 
This adds support for swapping the toolbar in inventories. For now, no key is assigned by default, so one must be added from the NEI options for this to take effect.
 2020-09-04 00:53:40 +02:00
The Temportalist 0e4a63d21c Update ArmorControls.java 
I appreciate the help, but this is actually correct.
 2015-09-09 18:28:46 -04:00
Ben Pilgrim b95f72dc06 Fixed ArmourControls.java and tested patch. 2015-09-09 22:30:53 +01:00
The Temportalist 74b70e2122 Update ArmorControls.java 
Updates for NeK 2.0.1, and in the process fixing https://github.com/mod-warriors/NotEnoughKeys/issues/34
Requires testing.
 2015-09-08 13:17:39 -04:00
Bernhard Bonigl 83e71312c4 Prevent crashes with incorrectly initialized armor stuff #1668 2015-06-28 10:44:56 +02:00
Mitchell Petrie 150fb8b3f4 Fix tab position when NEI is installed and not hidden. 2015-03-27 22:24:25 -04:00
Mitchell Petrie c587a827c8 Fix tab position when effects are being displayed. 2015-03-27 17:12:59 -04:00
Bernhard Bonigl 22e6378e16 Prevent the renderer from rendering anything but tinkers stuff #1419 2015-02-27 13:08:18 +01:00
Bernhard Bonigl 478052bbd3 Don't render null items 2015-02-27 12:51:15 +01:00
Bernhard Bonigl 8074abc6fa Disable blending when rendering tools in the inventory. It shouldn't be necessary and caused issues with GUIs 2015-02-21 21:51:05 +01:00
Bernhard Bonigl ab96d8f46f Fix night-vision being activateable without upgrade #1377 2015-02-21 20:49:19 +01:00
Bernhard Bonigl 08af51fab3 Use state-save blending for liquid block drawing. This should finally solve all the drawing weirdness with alpha for any liquids drawn by tinkers. #1356 2015-01-24 13:32:00 +01:00
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