Permalink
Browse files

Update upstream

  • Loading branch information...
mastercoms committed Mar 17, 2018
1 parent d6c0724 commit 024fbc21140b9533cb84e323162bff02f0f379fb
Showing with 7 additions and 7 deletions.
  1. +4 −4 Paper-API-Patches/0001-POM-Changes.patch
  2. +1 −1 work/Bukkit
  3. +1 −1 work/Paper
  4. +1 −1 work/Spigot
@@ -1,11 +1,11 @@
From 2e1c96a326416e290bfdae65181fecf75a3d9b7d Mon Sep 17 00:00:00 2001
From 81bff55f79569a742a5ae8a0190e839000f3b9ba Mon Sep 17 00:00:00 2001
From: mastercoms <circuitsoft@tuta.io>
Date: Tue, 16 May 2017 22:07:47 -0400
Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml
index 45145c5f..b924661f 100644
index 45145c5f..889b1873 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,18 +4,20 @@
@@ -27,7 +27,7 @@ index 45145c5f..b924661f 100644
- <version>1.12.2-R0.1-SNAPSHOT</version>
+ <groupId>net.glowstone</groupId>
+ <artifactId>glowkit</artifactId>
+ <version>1.12.2-R2.0-SNAPSHOT</version>
+ <version>1.12.2-R2.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Paper-API</name>
@@ -81,5 +81,5 @@ index 45145c5f..b924661f 100644
<plugin>
<groupId>org.apache.maven.plugins</groupId>
--
2.16.1
2.16.2
Submodule Bukkit updated from c03d89 to bf61ff
Submodule Paper updated 60 files
+1 −0 .gitignore
+35 −0 LICENSE.md
+3 −3 Spigot-API-Patches/0002-add-Trove-and-FastUtil-to-Bukkit.patch
+3 −3 Spigot-API-Patches/0006-Add-async-chunk-load-API.patch
+2 −2 Spigot-API-Patches/0032-Add-MetadataStoreBase.removeAll-Plugin.patch
+2 −2 Spigot-API-Patches/0034-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+2 −2 Spigot-API-Patches/0041-Add-source-to-PlayerExpChangeEvent.patch
+1 −1 Spigot-API-Patches/0068-Handle-plugin-prefixes-in-implementation-logging-con.patch
+1 −1 Spigot-API-Patches/0069-Allow-plugins-to-use-SLF4J-for-logging.patch
+1 −1 Spigot-API-Patches/0070-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
+37 −0 Spigot-API-Patches/0088-Tameable-getOwnerUniqueId-API.patch
+4 −4 Spigot-Server-Patches/0006-Timings-v2.patch
+7 −7 Spigot-Server-Patches/0013-Drop-falling-block-and-tnt-entities-at-the-specified.patch
+10 −10 Spigot-Server-Patches/0022-Entity-Origin-API.patch
+5 −5 Spigot-Server-Patches/0028-Configurable-end-credits.patch
+4 −4 Spigot-Server-Patches/0042-Configurable-container-update-tick-rate.patch
+4 −4 Spigot-Server-Patches/0062-Disable-Scoreboards-for-non-players-by-default.patch
+3 −3 Spigot-Server-Patches/0081-Waving-banner-workaround.patch
+4 −4 Spigot-Server-Patches/0083-Don-t-teleport-dead-entities.patch
+5 −5 Spigot-Server-Patches/0106-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+4 −4 Spigot-Server-Patches/0116-Implement-PlayerLocaleChangeEvent.patch
+5 −5 Spigot-Server-Patches/0119-Vehicle-Event-Cancellation-Changes.patch
+4 −4 Spigot-Server-Patches/0133-Optional-TNT-doesn-t-move-in-water.patch
+4 −4 Spigot-Server-Patches/0146-Re-track-players-that-dismount-from-other-players.patch
+14 −6 Spigot-Server-Patches/0153-Auto-Save-Improvements.patch
+4 −4 Spigot-Server-Patches/0156-Auto-fix-bad-Y-levels-on-player-login.patch
+5 −5 Spigot-Server-Patches/0160-Add-EntityZapEvent.patch
+5 −5 Spigot-Server-Patches/0167-Optimise-removeQueue.patch
+4 −4 Spigot-Server-Patches/0177-Configurable-Cartographer-Treasure-Maps.patch
+6 −6 Spigot-Server-Patches/0181-Add-option-to-remove-invalid-statistics.patch
+5 −5 Spigot-Server-Patches/0183-Properly-fix-item-duplication-bug.patch
+2 −2 Spigot-Server-Patches/0184-String-based-Action-Bar-API.patch
+5 −5 Spigot-Server-Patches/0190-Enforce-Sync-Player-Saves.patch
+4 −4 Spigot-Server-Patches/0192-Don-t-allow-entities-to-ride-themselves-572.patch
+4 −4 Spigot-Server-Patches/0195-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+5 −5 Spigot-Server-Patches/0204-Properly-handle-async-calls-to-restart-the-server.patch
+5 −5 Spigot-Server-Patches/0207-Add-configuration-option-to-prevent-player-names-fro.patch
+4 −4 Spigot-Server-Patches/0208-Use-TerminalConsoleAppender-for-console-improvements.patch
+30 −22 Spigot-Server-Patches/0214-Basic-PlayerProfile-API.patch
+5 −5 Spigot-Server-Patches/0218-Entity-fromMobSpawner.patch
+4 −4 Spigot-Server-Patches/0232-Allow-specifying-a-custom-authentication-servers-dow.patch
+1 −1 Spigot-Server-Patches/0236-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
+1 −1 Spigot-Server-Patches/0237-Handle-plugin-prefixes-using-Log4J-configuration.patch
+3 −3 Spigot-Server-Patches/0238-Include-Log4J2-SLF4J-implementation.patch
+1 −1 Spigot-Server-Patches/0239-Disable-logger-prefix-for-various-plugins-bypassing-.patch
+4 −4 Spigot-Server-Patches/0257-Ability-to-apply-mending-to-XP-API.patch
+12 −7 Spigot-Server-Patches/0268-Extend-Player-Interact-cancellation-to-GUIs.patch
+39 −0 Spigot-Server-Patches/0270-Tameable-getOwnerUniqueId-API.patch
+38 −0 Spigot-Server-Patches/0271-Toggleable-player-crits-helps-mitigate-hacked-client.patch
+31 −0 Spigot-Server-Patches/0272-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
+34 −0 Spigot-Server-Patches/0273-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
+37 −0 Spigot-Server-Patches/0274-Disable-Explicit-Network-Manager-Flushing.patch
+394 −0 Spigot-Server-Patches/0275-Improved-Async-Task-Scheduler.patch
+675 −0 licenses/GPL.md
+23 −0 licenses/MIT.md
+7 −8 pom.xml
+11 −6 scripts/remap.sh
+1 −1 work/Bukkit
+1 −1 work/CraftBukkit
+1 −1 work/Spigot
Submodule Spigot updated from 4bd94d to c3093e

0 comments on commit 024fbc2

Please sign in to comment.