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: PowerNukkitX/PowerNukkitX
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: iPyCMC/PNX2
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 14 commits
  • 3,964 files changed
  • 8 contributors

Commits on Aug 28, 2024

  1. Merge pull request #1 from PowerNukkitX/master

    PNX Updates
    tunikakeks authored Aug 28, 2024
    Copy the full SHA
    edd4d3d View commit details
  2. Copy the full SHA
    a1d8ef7 View commit details
  3. Added translation stuff

    tunikakeks committed Aug 28, 2024
    Copy the full SHA
    5194067 View commit details
  4. Merge pull request #1 from tunikakeks/feat/trader-translations

    Wandering trader & translation system
    tunikakeks authored Aug 28, 2024
    Copy the full SHA
    a89b4b4 View commit details
  5. Change language string to player

    KeksDev @ PyCMC committed Aug 28, 2024
    Copy the full SHA
    1b9500c View commit details

Commits on Sep 5, 2024

  1. Fixes

    PyCMC committed Sep 5, 2024
    Copy the full SHA
    e93592e View commit details

Commits on Sep 20, 2024

  1. Some changes

    PyCMC committed Sep 20, 2024
    Copy the full SHA
    6562def View commit details
  2. MC 1.21.30 (#2)

    * Fix: TNT explosion while piston arm is extended throwing error (#1677)
    
    * feat: PlayerTransferItemEvent
    
    * fix: fix biome saving issue
    
    * Initial 1.21.30 commit (unfinished)
    
    * 1.21.30 changes
    
    * 1.21.30 (wip)
    
    * fix: packets
    
    * Fix block air interact (#1678)
    
    * Update Item.java
    
    * Update InventoryTransactionProcessor.java
    
    * Fix double half slabs (#1679)
    
    * Update BlockBrickDoubleSlab.java
    
    * Update BlockCobblestoneDoubleSlab.java
    
    * Update BlockDioriteDoubleSlab.java
    
    * Update BlockEndStoneBrickDoubleSlab.java
    
    * Update BlockGraniteDoubleSlab.java
    
    * Fix item dirt sand (#1680)
    
    * Update ItemDirt.java
    
    * Update ItemSand.java
    
    * Fix level tick (#1682)
    
    * Update PlayerChunkManager.java
    
    The forEach caused some problems for some reason so I changed it to a for loop.
    
    * Update PlayerChunkManager.java
    
    * Fix stonecutter (#1681)
    
    * Update PlayerChunkManager.java
    
    The forEach caused some problems for some reason so I changed it to a for loop.
    
    * Update PlayerChunkManager.java
    
    * Update StonecutterInventory.java
    
    * Update BlockNoteblock.java (#1683)
    
    * Fixing worldspawn (#1684)
    
    * Update ServerSettings.java
    
    * Update Level.java
    
    * Update Player.java
    
    * Fixing Sandstone (#1685)
    
    Update ItemSandstone.java
    
    * Fixing durable Items (#1686)
    
    Update InventoryTransactionProcessor.java
    
    * Update InventoryTransactionProcessor.java
    
    * Fixing Item Drag distribution (#1687)
    
    * Added basic entity ai to the most important entities (#1688)
    
    * Create HoppingController.java
    
    * Update EntitySlime.java
    
    * Update EntityArmadillo.java
    
    * Update EntityAxolotl.java
    
    * Update EntityBat.java
    
    * Update EntityBee.java
    
    * Update EntityCamel.java
    
    * Update EntityDonkey.java
    
    * Update EntityFox.java
    
    * Update EntityGoat.java
    
    * Update EntityHorse.java
    
    * Update EntityMule.java
    
    * Update EntityOcelot.java
    
    * Update EntityPanda.java
    
    * Update EntityPolarBear.java
    
    * Update EntityRabbit.java
    
    * Update EntitySniffer.java
    
    * Update ItemBrush.java
    
    * Update InventoryTransactionProcessor.java
    
    * Update ItemBrush.java
    
    * Update EntityDolphin.java
    
    * Update EntityFrog.java
    
    * Update EntityPufferfish.java
    
    * Update EntitySquid.java
    
    * Update EntityTadpole.java
    
    * Update EntityTurtle.java
    
    * Update EntityBlaze.java
    
    * Update EntityCaveSpider.java
    
    * Update EntityEnderman.java
    
    * Update EntityGhast.java
    
    * Update EntityGuardian.java
    
    * Update EntityHoglin.java
    
    * Update EntityMagmaCube.java
    
    * Update EntityPiglin.java
    
    * Update EntityPiglinBrute.java
    
    * Update EntityPillager.java
    
    * Update EntityRavager.java
    
    * Update EntityShulker.java
    
    * Update EntitySilverfish.java
    
    * Update EntitySnowGolem.java
    
    * Update EntitySpider.java
    
    * Update EntityWither.java
    
    * Update EntityZoglin.java
    
    * Update EntityDamageEvent.java
    
    * Update EntityMagmaCube.java
    
    * Update EntityPiglin.java
    
    * Update EntityPiglinBrute.java
    
    * Update EntityPillager.java
    
    * Update EntityRavager.java
    
    * Update EntitySilverfish.java
    
    * Update EntitySlime.java
    
    * Update EntitySpider.java
    
    * Fixing player invisibility for waterdog pe (#1691)
    
    Update Player.java
    
    * fix: wandering trader is not a lama (#1689)
    
    * Create EntityWanderingTrader.java
    
    * Update EntityRegistry.java
    
    * Small improvements (change plugin yml name & add shaded to snapshot) (#1690)
    
    * Change nukkit.yml to powernukkitx.yml
    
    * Add shaded jar to snapshot
    
    * Re-added nukkit.yml
    
    * Fix enchanter (#1693)
    
    * Update EnchantmentHelper.java
    
    * Update CraftRecipeActionProcessor.java
    
    * feat: blocks (wip)
    
    * Add shaded to snapshot (#1692)
    
    * 1.21.30 support
    
    * Fix: Reduce xp for anvil (#1695)
    
    * fix: chests no longer split between chunks (#1697)
    
    * possible chest fix
    
    * Oopsie... Re-create PNX.run.xml
    
    * fixed chest placing & pairWith check
    
    * fixed chest placing & pairWith check
    
    * fix: missing diorite wall updater
    
    ---------
    
    Co-authored-by: Azzi <azim7rgm@gmail.com>
    Co-authored-by: C0R0X <constantinfrank2005@gmail.com>
    Co-authored-by: daoge_cmd <3523206925@qq.com>
    Co-authored-by: Buddelbubi <44944269+Buddelbubi@users.noreply.github.com>
    Co-authored-by: Kyel0 <129817038+Kevin-SalazarG@users.noreply.github.com>
    6 people authored Sep 20, 2024
    Copy the full SHA
    2c5dc79 View commit details
  3. resolve conflicts

    PyCMC committed Sep 20, 2024
    Copy the full SHA
    2330a17 View commit details

Commits on Oct 11, 2024

  1. Copy the full SHA
    c4530eb View commit details

Commits on Oct 22, 2024

  1. feat: updaters

    C0R0X committed Oct 22, 2024
    Copy the full SHA
    7276708 View commit details

Commits on Oct 27, 2024

  1. resolve conflicts

    PyCMC committed Oct 27, 2024
    Copy the full SHA
    089bbf5 View commit details
  2. Merge branch 'PowerNukkitX-feat/1.21.40'

    PyCMC committed Oct 27, 2024
    Copy the full SHA
    a13b858 View commit details
  3. Resolve conflicts

    PyCMC committed Oct 27, 2024
    Copy the full SHA
    45a3243 View commit details
Loading