iam4722202468 a0a770c4a3 Merge remote-tracking branch 'minestom/1_20_5' into improved-pathfinding ... # Conflicts: # build.gradle.kts # demo/src/main/java/net/minestom/demo/Main.java # demo/src/main/java/net/minestom/demo/PlayerInit.java # src/main/java/net/minestom/server/MinecraftServer.java # src/main/java/net/minestom/server/component/DataComponent.java # src/main/java/net/minestom/server/component/DataComponentImpl.java # src/main/java/net/minestom/server/entity/Metadata.java # src/main/java/net/minestom/server/entity/pathfinding/PFPathingEntity.java # src/main/java/net/minestom/server/instance/DynamicChunk.java # src/main/java/net/minestom/server/instance/block/predicate/BlockPredicate.java # src/main/java/net/minestom/server/inventory/ContainerInventory.java # src/main/java/net/minestom/server/inventory/Inventory.java # src/main/java/net/minestom/server/inventory/PlayerInventory.java # src/main/java/net/minestom/server/item/ItemComponent.java # src/main/java/net/minestom/server/item/attribute/AttributeSlot.java # src/main/java/net/minestom/server/item/component/Bee.java # src/main/java/net/minestom/server/item/component/BlockPredicates.java # src/main/java/net/minestom/server/item/component/DebugStickState.java # src/main/java/net/minestom/server/item/component/DyedItemColor.java # src/main/java/net/minestom/server/item/component/EnchantmentList.java # src/main/java/net/minestom/server/item/component/FireworkExplosion.java # src/main/java/net/minestom/server/item/component/PotionContents.java # src/main/java/net/minestom/server/listener/CreativeInventoryActionListener.java # src/main/java/net/minestom/server/listener/PlayerDiggingListener.java # src/main/java/net/minestom/server/listener/WindowListener.java # src/main/java/net/minestom/server/listener/manager/PacketListenerManager.java # src/main/java/net/minestom/server/network/ConnectionManager.java # src/main/java/net/minestom/server/network/NetworkBuffer.java # src/main/java/net/minestom/server/network/NetworkBufferTypeImpl.java # src/main/java/net/minestom/server/network/packet/client/handshake/ClientHandshakePacket.java # src/main/java/net/minestom/server/utils/nbt/BinaryTagSerializer.java # src/test/java/net/minestom/server/inventory/click/ClickUtils.java		2024-05-09 22:15:52 -04:00
..
src/main/java/net/minestom/demo	Merge remote-tracking branch 'minestom/1_20_5' into improved-pathfinding	2024-05-09 22:15:52 -04:00
build.gradle.kts	hollow-cube/gradle-rework (#8)	2024-02-09 14:27:43 -05:00