Commit graph

38 commits

Author SHA1 Message Date
Spigot
1180c5cc83 Upstream merge
By: md_5 <git@md-5.net>
2014-01-15 20:28:26 +11:00
Spigot
fe21d2887d Fix patch tree.
By: md_5 <git@md-5.net>
2013-12-22 10:06:06 +11:00
Spigot
2c6428f4b1 Upstream merge, nothing major.
By: md_5 <git@md-5.net>
2013-12-21 19:13:39 +11:00
Spigot
72cde1fd01 Upstream merge
By: md_5 <git@md-5.net>
2013-12-18 17:48:18 +11:00
Spigot
d908152b5e Fix shade fix accidentally being unmerged
By: md_5 <md_5@live.com.au>
2013-12-04 19:57:08 +11:00
Spigot
534e2d536d Actually fix division by 0 in growth
By: md_5 <md_5@live.com.au>
2013-12-03 09:05:49 +11:00
Spigot
9b902e4a4c Update maven shade plugin so that newer maven versions (ie travis) will compile.
By: md_5 <md_5@live.com.au>
2013-12-03 08:21:58 +11:00
Spigot
9a876418c1 Upstream merge
By: md_5 <md_5@live.com.au>
2013-12-02 07:36:51 +11:00
Spigot
ff79e2c7df Stage 1
By: md_5 <md_5@live.com.au>
2013-12-01 14:40:53 +11:00
Spigot
964389e910 Update master to R2 as well.
By: md_5 <md_5@live.com.au>
2013-11-05 10:46:34 +11:00
Spigot
9658a61088 Upstream Merge
By: md_5 <md_5@live.com.au>
2013-10-24 21:23:24 +11:00
Spigot
d0f0d605bf Update to CraftBukkit 1.6.4
By: md_5 <md_5@live.com.au>
2013-09-20 11:46:45 +10:00
Spigot
754e2b5680 Upstream merge + remove 3 pulled patches.
By: md_5 <md_5@live.com.au>
2013-09-12 10:17:46 +10:00
Spigot
3eb0f032f0 Upstream merge
By: md_5 <md_5@live.com.au>
2013-08-07 17:16:57 +10:00
Spigot
51c9200b04 Update to latest CraftBukkit and refresh all patch hashes - somehow InventoryClickEvent patch got applied twice.
By: md_5 <md_5@live.com.au>
2013-07-11 11:31:30 +10:00
Spigot
6fe8638955 Update Spigot to Minecraft 1.6.2
By: md_5 <md_5@live.com.au>
2013-07-09 10:31:10 +10:00
Spigot
8bdeaf2c08 Update Depends
- All of these changes have been reviewed to be binary compatible and in general contract compatible with previous versions of the libraries.

By: md_5 <md_5@live.com.au>
2013-07-04 20:05:41 +10:00
Spigot
3d185b5792 Remove LocalLanguage patch for now
By: md_5 <md_5@live.com.au>
2013-07-02 13:14:40 +10:00
Spigot
acb5c443c4 Update to Minecraft 1.6.1 - Phase 1
By: md_5 <md_5@live.com.au>
2013-07-02 13:03:56 +10:00
Spigot
52cf9d619c Compiling up to patch 10
By: md_5 <md_5@live.com.au>
2013-06-21 17:00:01 +10:00
Spigot
b7bbdfb74e Refresh the hashes of all our patches so they are nicely in sync after our new RB.
By: md_5 <md_5@live.com.au>
2013-06-16 21:45:21 +10:00
Spigot
be02458440 Update versions.
By: md_5 <md_5@live.com.au>
2013-06-15 19:08:22 +10:00
Spigot
326c461585 Update to latest upstream
By: md_5 <md_5@live.com.au>
2013-05-04 09:24:15 +10:00
Spigot
1857895f30 [CAUTION] Initial 1.5.2 update - I have NOT had time to TEST. DO NOT use on production server WITHOUT TESTING FIRST.
By: md_5 <md_5@live.com.au>
2013-05-01 08:33:27 +10:00
Spigot
cde5a715a3 FIx spacing
By: md_5 <md_5@live.com.au>
2013-04-23 11:35:18 +10:00
Spigot
2a38426e59 Move version resolve check to initial POM patch
By: md_5 <md_5@live.com.au>
2013-04-23 11:32:07 +10:00
Spigot
2755113f87 Now that thats out the way..
By: md_5 <md_5@live.com.au>
2013-04-13 17:14:56 +10:00
Spigot
ece477d0c7 Remove a fair chunk of existing patches now applied to CraftBukkit
By: md_5 <md_5@live.com.au>
2013-04-13 17:06:23 +10:00
Spigot
a893386a86 Remove stats completely from patches.
By: md_5 <md_5@live.com.au>
2013-04-10 14:08:33 +10:00
Spigot
ce23b8892d Update for upstream version change
By: Ammar Askar <ammar@ammaraskar.com>
2013-04-04 15:58:51 +05:00
Spigot
08676f42a0 revert changes to disabled plugins and scheduler.
sorry for messy commit,doing via tablet on ssh
md_5

By: Hudson <hudson@mydomain.com>
2013-04-03 02:20:29 -05:00
Spigot
f370ab8784 Update to 1.5.1
By: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com>
2013-03-20 21:54:12 +00:00
Spigot
f4da5482df Deploy server again. wot eva
By: md_5 <md_5@live.com.au>
2013-03-17 12:27:11 +11:00
Spigot
f831bcfce2 Phase 1 of MC 1.5 update. No this is not meant to compile, don't get your hopes up :p
By: md_5 <md_5@live.com.au>
2013-03-16 08:35:56 +11:00
Spigot
89f57511ac Rename generated repo, and only deploy API, not server.
By: md_5 <md_5@live.com.au>
2013-03-07 17:45:12 +11:00
Spigot
f4ea7c10b0 Actually use the parent pom.
By: md_5 <md_5@live.com.au>
2013-02-03 09:54:16 +11:00
Spigot
a6f60283d4 Just use the parent pom.
By: md_5 <md_5@live.com.au>
2013-02-03 09:48:23 +11:00
Spigot
4911597232 Update POM changes to individual patches.
By: md_5 <md_5@live.com.au>
2013-02-03 09:38:54 +11:00