From 6e5e95f4927624fa33231de8b919279a1a9a16c3 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 12 May 2021 11:32:44 -0400 Subject: [PATCH] drop cadmium --- Licensing/LICENSE.md | 1 - PATCHES.md | 1 - README.md | 1 - patches/{ => removed}/server/0059-Port-Cadmium.patch | 0 ...um-CompactSineLUT.patch => 0059-Lithium-CompactSineLUT.patch} | 0 ...-tic-tacs-unblocking.patch => 0060-tic-tacs-unblocking.patch} | 0 ...1-lithium-optimize-BlockPos.iterateOutwards-by-caching.patch} | 0 .../{0063-lithium-block.patch => 0062-lithium-block.patch} | 0 .../{0064-lithium-entity.patch => 0063-lithium-entity.patch} | 0 .../server/{0065-lithium-gen.patch => 0064-lithium-gen.patch} | 0 .../{0066-lithium-shape.patch => 0065-lithium-shape.patch} | 0 ...6-lithium-skip-ticking-block-entities-that-are-doing-n.patch} | 0 ...0068-Fix-Log4j-Warning.patch => 0067-Fix-Log4j-Warning.patch} | 0 13 files changed, 3 deletions(-) rename patches/{ => removed}/server/0059-Port-Cadmium.patch (100%) rename patches/server/{0060-Lithium-CompactSineLUT.patch => 0059-Lithium-CompactSineLUT.patch} (100%) rename patches/server/{0061-tic-tacs-unblocking.patch => 0060-tic-tacs-unblocking.patch} (100%) rename patches/server/{0062-lithium-optimize-BlockPos.iterateOutwards-by-caching.patch => 0061-lithium-optimize-BlockPos.iterateOutwards-by-caching.patch} (100%) rename patches/server/{0063-lithium-block.patch => 0062-lithium-block.patch} (100%) rename patches/server/{0064-lithium-entity.patch => 0063-lithium-entity.patch} (100%) rename patches/server/{0065-lithium-gen.patch => 0064-lithium-gen.patch} (100%) rename patches/server/{0066-lithium-shape.patch => 0065-lithium-shape.patch} (100%) rename patches/server/{0067-lithium-skip-ticking-block-entities-that-are-doing-n.patch => 0066-lithium-skip-ticking-block-entities-that-are-doing-n.patch} (100%) rename patches/server/{0068-Fix-Log4j-Warning.patch => 0067-Fix-Log4j-Warning.patch} (100%) diff --git a/Licensing/LICENSE.md b/Licensing/LICENSE.md index 80b2b880..d369809b 100644 --- a/Licensing/LICENSE.md +++ b/Licensing/LICENSE.md @@ -3,7 +3,6 @@ All patches (.patch files) marked with "lithium" are licensed under LGPL3 found [here](https://github.com/CaffeineMC/lithium-fabric/blob/1.16.x/dev/LICENSE.txt).
All patches (.patch files) marked with "hydrogen" are licensed under LGPL3 found [here](https://github.com/CaffeineMC/hydrogen-fabric/blob/1.16.x/LICENSE.txt).
All patches (.patch files) marked with "krypton" are licensed under MIT found [here](https://github.com/astei/krypton/blob/master/LICENSE).
-All patches (.patch files) marked with "Cadmium" are licensed under MIT found [here](https://github.com/LucilleTea/cadmium-fabric/blob/1.16.x/dev-my-fork/LICENSE.txt).
All patches (.patch files) marked with "Tic-Tacs" are licensed under LGPLv3 found [here](https://github.com/Gegy/tic-tacs/blob/1.16.4/LICENSE).
All other patches (.patch files) included in this repo are licensed under the MIT license found [here](MIT.md).
See [EMC](https://github.com/starlis/empirecraft/blob/master/README.md), [Akarin](https://github.com/Akarin-project/Akarin/blob/1.16.5/LICENSE.md), [Purpur](https://github.com/pl3xgaming/Purpur/blob/ver/1.16.5/LICENSE), [Airplane](https://github.com/Technove/Airplane/blob/master/PATCHES-LICENSE), [Origami](https://github.com/Minebench/Origami/blob/1.16/PATCHES-LICENSE), and [Tuinity](https://github.com/Spottedleaf/Tuinity/blob/master/PATCHES-LICENSE) for the license of patches automatically pulled during upstream updates. diff --git a/PATCHES.md b/PATCHES.md index d8872f18..b19a6dd7 100644 --- a/PATCHES.md +++ b/PATCHES.md @@ -347,7 +347,6 @@ # Patches | api | PlayerSetSpawnerTypeWithEggEvent | William Blake Galbreath | | | server | Players should not cram to death | William Blake Galbreath | | | server | Populator seed controls | Spottedleaf | | -| server | Port Cadmium | Lucy-t | | | server | Preload ProtocolLib EnumWrappers | ishland | | | server | Prevent long map entry creation in light engine | Spottedleaf | | | server | Prevent unload() calls removing tickets for sync loads | Spottedleaf | | diff --git a/README.md b/README.md index a8f07229..af0e77b0 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,6 @@ ## So what is Yatopia? * [Origami](https://github.com/Minebench/Origami) * [Purpur](https://github.com/pl3xgaming/Purpur) * [Airplane](https://github.com/Technove/Airplane) -* [Cadmium](https://github.com/LucilleTea/cadmium-fabric) * [Tic-Tacs](https://github.com/Gegy/tic-tacs) diff --git a/patches/server/0059-Port-Cadmium.patch b/patches/removed/server/0059-Port-Cadmium.patch similarity index 100% rename from patches/server/0059-Port-Cadmium.patch rename to patches/removed/server/0059-Port-Cadmium.patch diff --git a/patches/server/0060-Lithium-CompactSineLUT.patch b/patches/server/0059-Lithium-CompactSineLUT.patch similarity index 100% rename from patches/server/0060-Lithium-CompactSineLUT.patch rename to patches/server/0059-Lithium-CompactSineLUT.patch diff --git a/patches/server/0061-tic-tacs-unblocking.patch b/patches/server/0060-tic-tacs-unblocking.patch similarity index 100% rename from patches/server/0061-tic-tacs-unblocking.patch rename to patches/server/0060-tic-tacs-unblocking.patch diff --git a/patches/server/0062-lithium-optimize-BlockPos.iterateOutwards-by-caching.patch b/patches/server/0061-lithium-optimize-BlockPos.iterateOutwards-by-caching.patch similarity index 100% rename from patches/server/0062-lithium-optimize-BlockPos.iterateOutwards-by-caching.patch rename to patches/server/0061-lithium-optimize-BlockPos.iterateOutwards-by-caching.patch diff --git a/patches/server/0063-lithium-block.patch b/patches/server/0062-lithium-block.patch similarity index 100% rename from patches/server/0063-lithium-block.patch rename to patches/server/0062-lithium-block.patch diff --git a/patches/server/0064-lithium-entity.patch b/patches/server/0063-lithium-entity.patch similarity index 100% rename from patches/server/0064-lithium-entity.patch rename to patches/server/0063-lithium-entity.patch diff --git a/patches/server/0065-lithium-gen.patch b/patches/server/0064-lithium-gen.patch similarity index 100% rename from patches/server/0065-lithium-gen.patch rename to patches/server/0064-lithium-gen.patch diff --git a/patches/server/0066-lithium-shape.patch b/patches/server/0065-lithium-shape.patch similarity index 100% rename from patches/server/0066-lithium-shape.patch rename to patches/server/0065-lithium-shape.patch diff --git a/patches/server/0067-lithium-skip-ticking-block-entities-that-are-doing-n.patch b/patches/server/0066-lithium-skip-ticking-block-entities-that-are-doing-n.patch similarity index 100% rename from patches/server/0067-lithium-skip-ticking-block-entities-that-are-doing-n.patch rename to patches/server/0066-lithium-skip-ticking-block-entities-that-are-doing-n.patch diff --git a/patches/server/0068-Fix-Log4j-Warning.patch b/patches/server/0067-Fix-Log4j-Warning.patch similarity index 100% rename from patches/server/0068-Fix-Log4j-Warning.patch rename to patches/server/0067-Fix-Log4j-Warning.patch