From 3721b1466f57bebb9d4747802b028a00c36a8e51 Mon Sep 17 00:00:00 2001 From: Josh Roy <10731363+JRoy@users.noreply.github.com> Date: Mon, 14 Jun 2021 06:47:04 -0700 Subject: [PATCH] need to look at this later, fails rn --- ...3-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch | 2 +- .../0490-Don-t-mark-null-chunk-sections-for-block-updates.patch | 0 ...ght.patch => 0490-Fix-MC-187716-Use-configured-height.patch} | 0 ... 0491-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch} | 0 ...-Do-not-let-the-server-load-chunks-from-newer-version.patch} | 0 .../{0494-Brand-support.patch => 0493-Brand-support.patch} | 0 ...setMaxPlayers-API.patch => 0494-Add-setMaxPlayers-API.patch} | 0 ...h => 0495-Add-playPickupItemAnimation-to-LivingEntity.patch} | 0 ...e-FACING-data.patch => 0496-Don-t-require-FACING-data.patch} | 0 ...497-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} | 0 ...9-Add-moon-phase-API.patch => 0498-Add-moon-phase-API.patch} | 0 ...h => 0499-Prevent-headless-pistons-from-being-created.patch} | 0 ...501-Add-BellRingEvent.patch => 0500-Add-BellRingEvent.patch} | 0 ...ig.patch => 0501-Add-zombie-targets-turtle-egg-config.patch} | 0 ...er-joins-to-world.patch => 0502-Buffer-joins-to-world.patch} | 0 ...e-algorithm.patch => 0503-Optimize-redstone-algorithm.patch} | 0 ...0504-Fix-hex-colors-not-working-in-some-kick-messages.patch} | 0 ...ch => 0505-PortalCreateEvent-needs-to-know-its-entity.patch} | 0 ...eam-null-check.patch => 0506-Fix-CraftTeam-null-check.patch} | 0 ...Add-more-Evoker-API.patch => 0507-Add-more-Evoker-API.patch} | 0 ...-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch} | 0 21 files changed, 1 insertion(+), 1 deletion(-) rename patches/{server => removed/1.17}/0490-Don-t-mark-null-chunk-sections-for-block-updates.patch (100%) rename patches/server/{0491-Fix-MC-187716-Use-configured-height.patch => 0490-Fix-MC-187716-Use-configured-height.patch} (100%) rename patches/server/{0492-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch => 0491-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch} (100%) rename patches/server/{0493-Do-not-let-the-server-load-chunks-from-newer-version.patch => 0492-Do-not-let-the-server-load-chunks-from-newer-version.patch} (100%) rename patches/server/{0494-Brand-support.patch => 0493-Brand-support.patch} (100%) rename patches/server/{0495-Add-setMaxPlayers-API.patch => 0494-Add-setMaxPlayers-API.patch} (100%) rename patches/server/{0496-Add-playPickupItemAnimation-to-LivingEntity.patch => 0495-Add-playPickupItemAnimation-to-LivingEntity.patch} (100%) rename patches/server/{0497-Don-t-require-FACING-data.patch => 0496-Don-t-require-FACING-data.patch} (100%) rename patches/server/{0498-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch => 0497-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} (100%) rename patches/server/{0499-Add-moon-phase-API.patch => 0498-Add-moon-phase-API.patch} (100%) rename patches/server/{0500-Prevent-headless-pistons-from-being-created.patch => 0499-Prevent-headless-pistons-from-being-created.patch} (100%) rename patches/server/{0501-Add-BellRingEvent.patch => 0500-Add-BellRingEvent.patch} (100%) rename patches/server/{0502-Add-zombie-targets-turtle-egg-config.patch => 0501-Add-zombie-targets-turtle-egg-config.patch} (100%) rename patches/server/{0503-Buffer-joins-to-world.patch => 0502-Buffer-joins-to-world.patch} (100%) rename patches/server/{0504-Optimize-redstone-algorithm.patch => 0503-Optimize-redstone-algorithm.patch} (100%) rename patches/server/{0505-Fix-hex-colors-not-working-in-some-kick-messages.patch => 0504-Fix-hex-colors-not-working-in-some-kick-messages.patch} (100%) rename patches/server/{0506-PortalCreateEvent-needs-to-know-its-entity.patch => 0505-PortalCreateEvent-needs-to-know-its-entity.patch} (100%) rename patches/server/{0507-Fix-CraftTeam-null-check.patch => 0506-Fix-CraftTeam-null-check.patch} (100%) rename patches/server/{0508-Add-more-Evoker-API.patch => 0507-Add-more-Evoker-API.patch} (100%) rename patches/server/{0509-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch => 0508-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch} (100%) diff --git a/patches/api/0223-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/patches/api/0223-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch index 5e9876ef4..d9c9d2143 100644 --- a/patches/api/0223-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch +++ b/patches/api/0223-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000>>>>>>> replacement000000000000000000 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MeFisto94 Date: Tue, 11 Aug 2020 19:17:46 +0200 Subject: [PATCH] Add a way to get translation keys for blocks, entities and diff --git a/patches/server/0490-Don-t-mark-null-chunk-sections-for-block-updates.patch b/patches/removed/1.17/0490-Don-t-mark-null-chunk-sections-for-block-updates.patch similarity index 100% rename from patches/server/0490-Don-t-mark-null-chunk-sections-for-block-updates.patch rename to patches/removed/1.17/0490-Don-t-mark-null-chunk-sections-for-block-updates.patch diff --git a/patches/server/0491-Fix-MC-187716-Use-configured-height.patch b/patches/server/0490-Fix-MC-187716-Use-configured-height.patch similarity index 100% rename from patches/server/0491-Fix-MC-187716-Use-configured-height.patch rename to patches/server/0490-Fix-MC-187716-Use-configured-height.patch diff --git a/patches/server/0492-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0491-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from patches/server/0492-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to patches/server/0491-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/patches/server/0493-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0492-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from patches/server/0493-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to patches/server/0492-Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/patches/server/0494-Brand-support.patch b/patches/server/0493-Brand-support.patch similarity index 100% rename from patches/server/0494-Brand-support.patch rename to patches/server/0493-Brand-support.patch diff --git a/patches/server/0495-Add-setMaxPlayers-API.patch b/patches/server/0494-Add-setMaxPlayers-API.patch similarity index 100% rename from patches/server/0495-Add-setMaxPlayers-API.patch rename to patches/server/0494-Add-setMaxPlayers-API.patch diff --git a/patches/server/0496-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0495-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/server/0496-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/server/0495-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/server/0497-Don-t-require-FACING-data.patch b/patches/server/0496-Don-t-require-FACING-data.patch similarity index 100% rename from patches/server/0497-Don-t-require-FACING-data.patch rename to patches/server/0496-Don-t-require-FACING-data.patch diff --git a/patches/server/0498-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0497-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 100% rename from patches/server/0498-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/server/0497-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch diff --git a/patches/server/0499-Add-moon-phase-API.patch b/patches/server/0498-Add-moon-phase-API.patch similarity index 100% rename from patches/server/0499-Add-moon-phase-API.patch rename to patches/server/0498-Add-moon-phase-API.patch diff --git a/patches/server/0500-Prevent-headless-pistons-from-being-created.patch b/patches/server/0499-Prevent-headless-pistons-from-being-created.patch similarity index 100% rename from patches/server/0500-Prevent-headless-pistons-from-being-created.patch rename to patches/server/0499-Prevent-headless-pistons-from-being-created.patch diff --git a/patches/server/0501-Add-BellRingEvent.patch b/patches/server/0500-Add-BellRingEvent.patch similarity index 100% rename from patches/server/0501-Add-BellRingEvent.patch rename to patches/server/0500-Add-BellRingEvent.patch diff --git a/patches/server/0502-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0501-Add-zombie-targets-turtle-egg-config.patch similarity index 100% rename from patches/server/0502-Add-zombie-targets-turtle-egg-config.patch rename to patches/server/0501-Add-zombie-targets-turtle-egg-config.patch diff --git a/patches/server/0503-Buffer-joins-to-world.patch b/patches/server/0502-Buffer-joins-to-world.patch similarity index 100% rename from patches/server/0503-Buffer-joins-to-world.patch rename to patches/server/0502-Buffer-joins-to-world.patch diff --git a/patches/server/0504-Optimize-redstone-algorithm.patch b/patches/server/0503-Optimize-redstone-algorithm.patch similarity index 100% rename from patches/server/0504-Optimize-redstone-algorithm.patch rename to patches/server/0503-Optimize-redstone-algorithm.patch diff --git a/patches/server/0505-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0504-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from patches/server/0505-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to patches/server/0504-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/patches/server/0506-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0505-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 100% rename from patches/server/0506-PortalCreateEvent-needs-to-know-its-entity.patch rename to patches/server/0505-PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/patches/server/0507-Fix-CraftTeam-null-check.patch b/patches/server/0506-Fix-CraftTeam-null-check.patch similarity index 100% rename from patches/server/0507-Fix-CraftTeam-null-check.patch rename to patches/server/0506-Fix-CraftTeam-null-check.patch diff --git a/patches/server/0508-Add-more-Evoker-API.patch b/patches/server/0507-Add-more-Evoker-API.patch similarity index 100% rename from patches/server/0508-Add-more-Evoker-API.patch rename to patches/server/0507-Add-more-Evoker-API.patch diff --git a/patches/server/0509-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/patches/server/0508-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch similarity index 100% rename from patches/server/0509-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch rename to patches/server/0508-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch