need to look at this later, fails rn

2021-06-14 06:47:04 -07:00 · 2021-06-14 06:47:04 -07:00 · 3721b1466f
commit 3721b1466f
parent cfb17666ff
21 changed files with 1 additions and 1 deletions
--- 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 <MeFisto94@users.noreply.github.com>
 Date: Tue, 11 Aug 2020 19:17:46 +0200
 Subject: [PATCH] Add a way to get translation keys for blocks, entities and
--- a/patches/removed/1.17/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
--- a/patches/server/0490-Fix-MC-187716-Use-configured-height.patch
+++ b/patches/server/0490-Fix-MC-187716-Use-configured-height.patch
--- a/patches/server/0491-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
+++ b/patches/server/0491-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
--- a/patches/server/0492-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
--- a/patches/server/0493-Brand-support.patch
+++ b/patches/server/0493-Brand-support.patch
--- a/patches/server/0494-Add-setMaxPlayers-API.patch
+++ b/patches/server/0494-Add-setMaxPlayers-API.patch
--- a/patches/server/0495-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/server/0495-Add-playPickupItemAnimation-to-LivingEntity.patch
--- a/patches/server/0496-Don-t-require-FACING-data.patch
+++ b/patches/server/0496-Don-t-require-FACING-data.patch
--- a/patches/server/0497-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0497-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
--- a/patches/server/0498-Add-moon-phase-API.patch
+++ b/patches/server/0498-Add-moon-phase-API.patch
--- a/patches/server/0499-Prevent-headless-pistons-from-being-created.patch
+++ b/patches/server/0499-Prevent-headless-pistons-from-being-created.patch
--- a/patches/server/0500-Add-BellRingEvent.patch
+++ b/patches/server/0500-Add-BellRingEvent.patch
--- a/patches/server/0501-Add-zombie-targets-turtle-egg-config.patch
+++ b/patches/server/0501-Add-zombie-targets-turtle-egg-config.patch
--- a/patches/server/0502-Buffer-joins-to-world.patch
+++ b/patches/server/0502-Buffer-joins-to-world.patch
--- a/patches/server/0503-Optimize-redstone-algorithm.patch
+++ b/patches/server/0503-Optimize-redstone-algorithm.patch
--- a/patches/server/0504-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/server/0504-Fix-hex-colors-not-working-in-some-kick-messages.patch
--- a/patches/server/0505-PortalCreateEvent-needs-to-know-its-entity.patch
+++ b/patches/server/0505-PortalCreateEvent-needs-to-know-its-entity.patch
--- a/patches/server/0506-Fix-CraftTeam-null-check.patch
+++ b/patches/server/0506-Fix-CraftTeam-null-check.patch
--- a/patches/server/0507-Add-more-Evoker-API.patch
+++ b/patches/server/0507-Add-more-Evoker-API.patch
--- a/patches/server/0508-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