Show trades which share a cooldown if applicable. - #18

Closed

cubefury wants to merge 213 commits into

cubefury:masterfrom

GTNewHorizons:shared-cooldowns

Commits on Oct 7, 2025

Commits on Oct 8, 2025

Merge pull request #1 from Ranzuu/edit
cubefury
authored
9207b60
Merge pull request #2 from GTNewHorizons/structure-changes
cubefury
authored
3fe231b
update
Dream-Master
committed
d7ab8bb
Update zh_CN.lang
Omgise
authored
e0646fb
Update zh_CN.lang
Omgise
authored
e1f86c5
Merge pull request #6 from Omgise/master
cubefury
authored
914015c
Separate Tile name and gui title
Ranzuu
committed
8f27d4c
Localize the ME Vending Uplink Hatch Overlay
Ranzuu
committed
d286e85

Commits on Oct 10, 2025

Add list trade display format
cubefury
committed
2dfa859
Added alphabetical sort order
cubefury
committed
e9c7a7e
Separated Item and Item Count in list mode.
cubefury
committed
619d63f
Merge pull request #10 from GTNewHorizons/qol-toggles
cubefury
authored
deea723
Separated Item and Item Count in list mode.
cubefury
committed
8711e46
Merge pull request #11 from GTNewHorizons/readme-changes
cubefury
authored
a79b4d2
Changes:
cubefury
committed
15dfef5
Merge pull request #12 from GTNewHorizons/color-fixes
cubefury
authored
24c5d04
update
Dream-Master
committed
6bda1e8
Shifted text color setting to lang file
cubefury
committed
e2aed96
Merge pull request #13 from GTNewHorizons/color-fixes
cubefury
authored
2dda393

Commits on Oct 11, 2025

Commits on Oct 12, 2025

Merge pull request #17 from GTNewHorizons/fix-coins-not-updating
cubefury
authored
e81ffb3
Adapt to MUI2 update
cubefury
committed
19fd3c2
Fix hoverbackground behavior
cubefury
committed
b96f487
Fix hoverbackground behavior for lists
cubefury
committed
c224aca
Fixed persistent tooltips onMouseEndHover.
cubefury
committed
08b4984
Fix element positioning
cubefury
committed
f2eb136
Remove color-correction work around for ListWidget elements
cubefury
committed
9b87a8c
[Crashing] Address Review Comments
cubefury
committed
8dfe321
[Working] Address Review Comments
cubefury
committed
c948122
Merge pull request #18 from GTNewHorizons/fix-ui-crash
FrostyFire1
authored
d0a3700
Merge branch 'master' into remove-trade-labels
Dream-Master
authored
96c3207
Merge pull request #15 from GTNewHorizons/remove-trade-labels
Dream-Master
authored
00c6d40
update
Dream-Master
committed
634b9c5
Changes:
cubefury
committed
84a716d
Merge pull request #20 from GTNewHorizons/fix-no-compile
boubou19
authored
13f835a

Commits on Oct 13, 2025

Fixed coins not updating in multiplayer.
cubefury
committed
8d8c2b2
Revert event handler changes - out of scope for PR
cubefury
committed
1606b03
Merge pull request #21 from GTNewHorizons/fix-currency-sync
Dream-Master
authored
2eb06e9
update
Dream-Master
committed
29c4350
Changes:
cubefury
committed
6b6a6da
Fix NPE from trade item display load
cubefury
committed
2407461
Merge pull request #22 from GTNewHorizons/fix-sync
FrostyFire1
authored
5a3e0e0
Fix coins going missing on server start in multiplayer.
cubefury
committed
af399f8
Fixed backing up of tradestate file during write.
cubefury
committed
2d322b1
Merge pull request #24 from GTNewHorizons/fix-coins-void
Dream-Master
authored
9d7aa73

Commits on Oct 14, 2025

Commits on Oct 15, 2025

Commits on Oct 16, 2025

update
Dream-Master
committed
66f4215
Tidied up extra newlines in tooltips
cubefury
committed
b8f2f24
Fix NEI recipe handler underlines
cubefury
committed
0b08db4

Commits on Oct 17, 2025

Revert out of scope recipe handler change.
cubefury
committed
1d1ad17
update

Dream-Master
authored and
cubefury
committed
ac11406
Fixed recipe underlines in NEI
cubefury
committed
5593fbb
Added NC to corner of non-consumable stacks
cubefury
committed
3eb9255
Update GT package to reference new location of MTEMultiBlockBaseGui
cubefury
committed
fa66518
Address comments
cubefury
committed
efc9aec
update
Dream-Master
committed
7bf7d97
Merge pull request #31 from GTNewHorizons/update-gt-packages
Dream-Master
authored
240c55f
Added support for non-consumable items in a trade.

cubefury
authored and
Dream-Master
committed
a0ef8b2
Tidied up extra newlines in tooltips

cubefury
authored and
Dream-Master
committed
b8af728
Fix NEI recipe handler underlines

cubefury
authored and
Dream-Master
committed
760207a
Revert out of scope recipe handler change.

cubefury
authored and
Dream-Master
committed
d9d70d6
Merge pull request #29 from GTNewHorizons/support-non-consumables
FrostyFire1
authored
bde3c89
Update GT package to reference new location of MTEMultiBlockBaseGui
cubefury
committed
61ad4b7
Address comments
cubefury
committed
3abb3d4
update

Dream-Master
authored and
cubefury
committed
87c12bb
Merge branch 'master' into fix-recipe-display
cubefury
authored
8b30f7e
formatted nei display with more rows
cubefury
committed
f44cae1
Fix element positions
cubefury
committed
33eafc7
update
Dream-Master
committed
3664069

Commits on Oct 18, 2025

Disable trades and trade UI refresh when machine unforms
cubefury
committed
f3a46e8
Removed clunky baseMTE reference
cubefury
committed
654a52c
Disabled coin insert/eject when vm is not formed
cubefury
committed
803d62c
swapped to getActive()
cubefury
committed
01ed57a
Removed unnecessary null check
cubefury
committed
b345def
missed one
cubefury
committed
528796b
Merge branch 'master' into fix-recipe-display
cubefury
authored
e89013b
reduced max recipes per page
cubefury
committed
94e2a3a
Changed UI height
cubefury
committed
e5994ad
Merge pull request #33 from GTNewHorizons/fix
cubefury
authored
eda547c
Merge branch 'master' into fix-recipe-display
cubefury
authored
8c44f0e
Merge pull request #30 from GTNewHorizons/fix-recipe-display
Dream-Master
authored
ca10f12
update
Dream-Master
committed
733d8a4

Commits on Oct 19, 2025

ignore nbt
cubefury
committed
18ae904
Ignore NBT for items in ME system
cubefury
committed
ae4a89b
Removed experimental code and added null check for cached items
cubefury
committed
adf454b
spotless
cubefury
committed
bf49331

Commits on Oct 20, 2025

Commits on Oct 22, 2025

Merge pull request #34 from GTNewHorizons/ignore-trade-nbt
Dream-Master
authored
7248eaa
update
Dream-Master
committed
b9d34b6

Commits on Oct 28, 2025

Added coin add, set and reset commands.
cubefury
committed
c881208
Fixed hints for commands
cubefury
committed
dcfd79b

Commits on Oct 29, 2025

Fixed command arugment position checks.
cubefury
committed
90b4e3a

Commits on Nov 4, 2025

Fixed coin names
cubefury
committed
fac3f6d
Merge pull request #39 from GTNewHorizons/fix-coin-names
cubefury
authored
2a359ed
update
Dream-Master
committed
535976d

Commits on Nov 6, 2025

fixed NPE when trade database has no displayed item
cubefury
committed
3cbc071
Skip displaying cooldown remaining if trade is disabled anyway
cubefury
committed
bbedd48
actually load the trade count from file
cubefury
committed
1cfdb9f
Merge branch 'master' into add-commands
cubefury
authored
8c6f775
Address comments
cubefury
committed
9934b49
command hint fix
cubefury
committed
1c13c59
Update readme with commands
cubefury
committed
fc3db3f

Commits on Nov 14, 2025

Removed translator class reference from server side.
cubefury
committed
4564b94
spotless
cubefury
committed
63c5111
Added command feedback.
cubefury
committed
ae36d34

Commits on Nov 15, 2025

Merge pull request #40 from GTNewHorizons/fix-trade-limit
cubefury
authored
608f50a
Merge branch 'master' into add-commands
cubefury
authored
bc05ed7

Commits on Nov 16, 2025

Commits on Nov 19, 2025

Fix tile data saving.
cubefury
committed
d0aa702
Merge pull request #42 from GTNewHorizons/fix-items-missing
Dream-Master
authored
9b24840

Commits on Nov 24, 2025

ego stroking
cubefury
committed
533ec5c
Merge pull request #44 from GTNewHorizons/add-author
UltraProdigy
authored
e84725b

Commits on Nov 25, 2025

Commits on Dec 13, 2025

Extract display type to separate class
cubefury
committed
297ab73
Extract sort mode to separate class
cubefury
committed
48ac09b
Merge pull request #46 from GTNewHorizons/cleanup
UltraProdigy
authored
d19b7e2

Commits on Dec 15, 2025

Add Oredict compat
cubefury
committed
49e98cc
Fix bug where items accepting oredict would accept any item durability
cubefury
committed
d525004

Commits on Dec 16, 2025

Address comments
cubefury
committed
51bc418
Merge pull request #47 from GTNewHorizons/oredict-compat-2
UltraProdigy
authored
c57b9a9

Commits on Dec 17, 2025

Add Oredict tooltips
cubefury
committed
982fd0c
Merge pull request #49 from GTNewHorizons/oredict-tooltip
cubefury
authored
b1e1e15

Commits on Dec 18, 2025

Commits on Dec 19, 2025

Commits on Dec 20, 2025

Add periodic check for trade restock notifications.
cubefury
committed
43195b3
update
Dream-Master
committed
e359200

Commits on Dec 22, 2025

Commits on Dec 23, 2025

Address comments
cubefury
committed
fe7e4db
Address comments better
cubefury
committed
2b1c447
fix logic error when changing to inline instanceof
cubefury
committed
5aa96f4
Merge pull request #53 from GTNewHorizons/add-notifications
cubefury
authored
7c61daa
Refactored vending command
cubefury
committed
b800f9b

Commits on Dec 26, 2025

Merge pull request #54 from GTNewHorizons/refactor-commands
cubefury
authored
edff72f
Move player trade satisfied condition tracking into trade manager
cubefury
committed
08b8f87
Swap noconditiontrades to tradedatabase
cubefury
committed
f6e692f

Commits on Dec 27, 2025

Swap tradestate tracking to TradeManager
cubefury
committed
e37233f
Some comments
cubefury
committed
a0e4539
spotless
cubefury
committed
ec838ad
minor comments
cubefury
committed
1f2a198

Commits on Dec 31, 2025

Fixed requirement matching bug
cubefury
committed
78600ff
minor formatting
cubefury
committed
846a5ae
Fixed completed quest sync in MP
cubefury
committed
7edeed5

Commits on Jan 1, 2026

update bs+deps+gradle
Dream-Master
committed
8cbb4fb
Merge branch 'master' into refactor-trade-manager
Dream-Master
authored
9a8e61c

Commits on Jan 6, 2026

Merge pull request #55 from GTNewHorizons/refactor-trade-manager
Dream-Master
authored
3d36685

Commits on Jan 8, 2026

Commits on Jan 10, 2026

Registry Name Migration for NewHorizonsCoreMod
Nikolay-Sitnikov
authored
ffb2b66

Commits on Jan 17, 2026

Merge pull request #57 from GTNewHorizons/nhcoremod-migration
boubou19
authored
417c18a

Commits on Jan 21, 2026

Add hot db reload
cubefury
committed
46a87b3

Commits on Feb 1, 2026

spotless
cubefury
committed
cde6546
fix crash when opening UI after reload.
cubefury
committed
9c95a7e
Merge branch 'master' into hot-reload
cubefury
authored
e1373dc
Fix command behaviour.
cubefury
committed
ed7ecc5
Merge pull request #58 from GTNewHorizons/hot-reload
UltraProdigy
authored
3099f95

Commits on Feb 3, 2026

Update readme (#59)
cubefury
authored
0079034

Commits on Feb 4, 2026

Add structure error (#61)
cubefury
authored
1c0ada3

Commits on Feb 6, 2026

update
Dream-Master
committed
de8809d

Commits on Feb 7, 2026

fix (#62)
Dream-Master
authored
cf4dac1

Commits on Feb 8, 2026

adapt to mui2 upstream (#63)
chrombread
authored
47afd30

Commits on Feb 11, 2026

Commits on Feb 13, 2026

Check if player is not accessing vending machine before reloading tradestate (#66)
cubefury
authored
e42ccfa

Commits on Mar 4, 2026

Fix item ejecting direction (#67)
cubefury
authored
b89d235

Commits on Mar 11, 2026

Favourites tab (#68)
cubefury
authored
83c4f3c

Commits on Mar 13, 2026

Support all coins for NEI trade preview (#70)
cubefury
authored
fd831c8

Commits on Mar 14, 2026

Commits on Mar 16, 2026

op & wf (#75)
UltraProdigy
authored
b1b1ba1

Commits on Mar 20, 2026

Show trades which share a cooldown.
cubefury
committed
64b4e8d
update deps
cubefury
committed
1b3bddd