Commit graph

1648 commits

Author SHA1 Message Date
md_5
bb782d07ae Remove update depends patch. 2014-12-19 09:06:22 +11:00
md_5
d6b5ba7ca0 Fix merge conflicts. 2014-12-18 21:30:50 +11:00
md_5
a926b96d5d Fix conflicts 2014-12-18 11:14:43 +11:00
md_5
b43a31a5c2 Fix conflicts 2014-12-16 10:12:27 +11:00
Thinkofdeath
9b45d9fa8d Upstream merge 2014-12-15 15:53:27 +00:00
Suddenly
a3168ab2ce Fix the BiomeDecorator going missing due to the mc-dev-imports patch 2014-12-15 11:44:03 +00:00
md_5
612de46895 Add BungeeCord Chat API
Went missing in 1.8 update.
2014-12-13 22:57:37 +00:00
Thinkofdeath
320ed92779 Upstream merge 2014-12-13 12:35:10 +00:00
Thinkofdeath
3e3ea0bd0d Upstream merge - remove url fix as it was pulled upstream 2014-12-13 10:29:59 +00:00
Thinkofdeath
2b97a3846f Upstream merge 2014-12-12 21:47:18 +00:00
Thinkofdeath
116e6fc98d Fix build 2014-12-12 09:49:02 +00:00
Thinkofdeath
dc776bee32 Upstream merge 2014-12-12 09:47:02 +00:00
md_5
b023457499 Fix conflicts 2014-12-12 13:23:18 +11:00
Thinkofdeath
81e4ab71ca Rebuild patches 2014-12-11 20:46:00 +00:00
Thinkofdeath
330d66bfb6 Upstream merge 2014-12-11 00:46:55 +00:00
Thinkofdeath
da9bbdfaea Upstream merge 2014-12-11 00:42:19 +00:00
Thinkofdeath
edf691c2e9 Full rebuild 2014-12-10 19:55:03 +00:00
Thinkofdeath
29dbaa783f SPIGOT-170: Fix the particle api for id/data pairs 2014-12-10 15:35:51 +00:00
md_5
4460863133 Merge pull request #3 in SPIGOT/spigot from ~AIKAR/spigot:gitignore to master
* commit '92e9a2b4303b2554771576910e74cc94ea7c24bd':
  Add CraftBukkit and Bukkit to .gitignore
2014-12-10 03:54:05 +01:00
md_5
a93b19a04c Remove pom parent 2014-12-10 12:35:09 +11:00
Thinkofdeath
d5bf8668b9 Upstream merge 2014-12-09 12:23:11 +00:00
Thinkofdeath
c5492f8008 Upstream merge 2014-12-09 09:42:19 +00:00
Thinkofdeath
b8f6402bbb Upstream merge 2014-12-07 13:26:31 +00:00
Thinkofdeath
afe301fe89 Upstream merge 2014-12-07 12:20:39 +00:00
Thinkofdeath
0ddb6f3dde Upstream merge 2014-12-07 11:56:05 +00:00
Thinkofdeath
4beb4ac391 Upstream merge 2014-12-07 11:41:26 +00:00
Thinkofdeath
b28f0d3de2 Upstream merge 2014-12-07 11:07:30 +00:00
Thinkofdeath
92ee7e7f8e Update the attribute filter 2014-12-07 10:46:23 +00:00
Thinkofdeath
fba27a2ea8 And another 2014-12-07 01:34:31 +00:00
Thinkofdeath
bf71dc6114 Fix a missed rename in Entity Activation Range 2014-12-07 01:26:06 +00:00
md_5
b2740df50b Remove distribution section from spigot parent 2014-12-07 12:01:47 +11:00
md_5
6669d6ecd2 Rebuild patches / add deploy repo 2014-12-07 11:56:39 +11:00
Thinkofdeath
8dc4297e34 Upstream merge 2014-12-05 21:38:02 +00:00
Thinkofdeath
9a88a38258 Merge pull request #5 in SPIGOT/spigot from ~AIKAR/spigot:earChunk to master
* commit 'abcf7aa4a40be8f69e0ba772b310ace542a98f66':
  Ensure an entity that needs to be added to chunk ticks
2014-12-04 03:02:53 +01:00
Aikar
abcf7aa4a4 Ensure an entity that needs to be added to chunk ticks
It's possible an entity could be marked for deactivation while its in a
"needs to change chunks" state. This can cause it to then save to the world in the wrong chunk,
causing the "saved in wrong location" warnings.

This checks the boolean for isAddedToChunk and always ticks if its false.
2014-12-03 20:57:52 -05:00
Thinkofdeath
2a70ece9ab Merge pull request #4 in SPIGOT/spigot from ~AIKAR/spigot:improveWorldSave to master
* commit '72d33338f0828cadd956164951dc49d206363795':
  Improve the AutoSave mechanism
2014-12-04 02:37:25 +01:00
Aikar
72d33338f0 Improve the AutoSave mechanism
Only save modified chunks, or chunks with entities after 4 auto save passes

Also update rebuildPatches.sh to pass -A so it works on newer git clients and offer a "clean" rebuild
2014-12-03 20:31:01 -05:00
Aikar
92e9a2b430 Add CraftBukkit and Bukkit to .gitignore
This way they won't show up in your working directory as unadded files.
2014-12-03 12:49:49 -05:00
Thinkofdeath
da32fe1d54 Increase the max scoreboard objective size 2014-12-02 15:52:36 +00:00
Thinkofdeath
38b8866783 Merge pull request #2 in SPIGOT/spigot from ~DMCK2B/spigot:feature/returnLoadingLibraries to master
* commit '95d56229d8fb96d5eeddcbb739714fa04e7823be':
  Return the verbosity on startup
2014-12-02 00:49:40 +02:00
Thinkofdeath
baf01cc7f8 Make the /version command output useful 2014-12-01 21:18:58 +00:00
Thinkofdeath
87c1d0c8b7 Fix mob ageing 2014-12-01 20:42:58 +00:00
Suddenly
95d56229d8 Return the verbosity on startup 2014-12-01 17:18:24 +00:00
Thinkofdeath
a969bf6c85 Fix ./applyPatches.sh not updating Bukkit correctly 2014-12-01 10:29:54 +00:00
Thinkofdeath
66af3b310e Base the version hash on the root Spigot project instead of the Spigot-Server project 2014-12-01 10:17:33 +00:00
Thinkofdeath
068df64aee Rebuild all patches 2014-11-30 21:22:49 +00:00
Thinkofdeath
d1cdcf8d4c Remove old patch 2014-11-30 21:13:12 +00:00
Thinkofdeath
e6a3911057 Upstream merge 2014-11-30 21:12:35 +00:00
Thinkofdeath
5a0150f586 Fix ITEM_BREAK 2014-11-29 20:44:07 +00:00
Thinkofdeath
89d3fcbdfa Regen the patches 2014-11-28 23:29:40 +00:00