Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Patbox/UniversalShops
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: How-Server/UniversalShops
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 14 commits
  • 6 files changed
  • 1 contributor

Commits on Dec 8, 2023

  1. Add Hologram mode (only show price).

    @Howie0715
    Howie0715 committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    9bd301c View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2024

  1. Merge branch 'Patbox:1.20.5' into 1.20.5

    @Howie0715
    Howie0715 authored Apr 27, 2024
    Configuration menu
    Copy the full SHA
    0f1e179 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2024

  1. Merge branch 'Patbox:1.21' into 1.21

    @Howie0715
    Howie0715 authored Jun 20, 2024
    Configuration menu
    Copy the full SHA
    afd9eb9 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2024

  1. customize for personal server.

    @Howie0715
    Howie0715 committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    76f7445 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. Make the text display fully.

    @Howie0715
    Howie0715 committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    5a1e207 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2024

  1. Merge remote-tracking branch 'Patbox/1.21.2' into 1.21.2 

    # Conflicts:
#	src/main/java/eu/pb4/universalshops/trade/PriceHandler.java
#	src/main/java/eu/pb4/universalshops/trade/StockHandler.java
    @Howie0715
    Howie0715 committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    e64c29f View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2024

  1. continue using custom texture.

    @Howie0715
    Howie0715 committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    0b82f89 View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2024

  1. Merge remote-tracking branch 'Patbox/1.21.4' into 1.21.4 

    # Conflicts:
#	src/main/resources/data/universal_shops/lang/zh_tw.json
#	src/main/resources/data/universal_shops/recipe/trade_block.json
    @Howie0715
    Howie0715 committed Dec 24, 2024
    Configuration menu
    Copy the full SHA
    baad41c View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2025

  1. Reduce floating word and item rendering distance.

    @Howie0715
    Howie0715 committed Feb 8, 2025
    Configuration menu
    Copy the full SHA
    9c232fe View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2025

  1. Merge branch 'Patbox:1.21.5' into 1.21.5

    @Howie0715
    Howie0715 authored Apr 6, 2025
    Configuration menu
    Copy the full SHA
    9418d6e View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2025

  1. Merge branch 'Patbox:1.21.6' into 1.21.6

    @Howie0715
    Howie0715 authored Jun 19, 2025
    Configuration menu
    Copy the full SHA
    0c1b451 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2025

  1. Add support for displaying enchantment names on enchanted books in stock

    @Howie0715
    Howie0715 committed Aug 26, 2025
    Configuration menu
    Copy the full SHA
    fd05ee4 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2026

  1. Merge remote-tracking branch 'pat/main' 

    # Conflicts:
#	src/main/java/eu/pb4/universalshops/gui/ExtraGui.java
#	src/main/java/eu/pb4/universalshops/other/USUtil.java
#	src/main/java/eu/pb4/universalshops/registry/TradeShopBlockEntity.java
#	src/main/java/eu/pb4/universalshops/trade/StockHandler.java
    @Howie0715
    Howie0715 committed Feb 10, 2026
    Configuration menu
    Copy the full SHA
    494dd8b View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2026

  1. Fix enchantment name retrieval and update hologram display logic

    @Howie0715
    Howie0715 committed Feb 12, 2026
    Configuration menu
    Copy the full SHA
    2ffa90c View commit details
    Browse the repository at this point in the history
Loading