Commit graph

24 commits

Author SHA1 Message Date
Thinkofdeath
27cb8a7e6d Upstream merge 2014-06-02 15:38:03 +01:00
md_5
e052eada8c Upstream merge: conflict resolution and version bump 2014-05-15 17:05:45 +10:00
Thinkofdeath
4342681445 Upstream merge: 1.7.9 2014-04-17 20:50:10 +01:00
md_5
83ce6724ca Stage 1 2014-04-12 14:18:37 +10:00
Thinkofdeath
69324bba91 Update to 1.7.5 2014-03-23 00:06:43 +00:00
md_5
254df64f1b Rebuild patch hashes, fix build. 2014-03-10 09:14:45 +11:00
Thinkofdeath
5284bd1a74 Upstream merge 2014-02-12 14:06:33 +00:00
md_5
6a98142bd5 Fix patch tree. 2013-12-22 10:06:06 +11:00
md_5
1c099a713b Upstream merge, nothing major. 2013-12-21 19:13:39 +11:00
md_5
e9cb6ec3c5 Upstream merge 2013-12-18 17:48:18 +11:00
md_5
c8145fb896 Actually fix division by 0 in growth 2013-12-03 09:05:49 +11:00
md_5
31572d6c20 Update maven shade plugin so that newer maven versions (ie travis) will compile. 2013-12-03 08:21:58 +11:00
md_5
eb2ab6b421 Update mc-dev etc. 2013-12-01 15:14:03 +11:00
md_5
cdbe22b7c7 Update master to R2 as well. 2013-11-05 10:46:34 +11:00
md_5
f775c4dbd1 Upstream Merge 2013-10-24 21:23:24 +11:00
md_5
7509839cdf Update to CraftBukkit 1.6.4 2013-09-20 11:46:45 +10:00
md_5
1b854cbe28 Upstream merge + remove 3 pulled patches. 2013-09-12 10:20:02 +10:00
md_5
e36ba8dd96 Upstream merge 2013-08-07 17:16:57 +10:00
md_5
6b60db4272 Update to latest CraftBukkit and refresh all patch hashes - somehow InventoryClickEvent patch got applied twice. 2013-07-11 11:31:30 +10:00
md_5
9018b1d7ba Update Spigot to Minecraft 1.6.2 2013-07-09 10:31:10 +10:00
md_5
011b0d5923 Update Spigot-API to 1.6 2013-07-02 12:36:48 +10:00
md_5
0c7072f790 Refresh the hashes of all our patches so they are nicely in sync after our new RB. 2013-06-16 21:45:21 +10:00
md_5
2083a98e7b Update versions. 2013-06-15 19:08:22 +10:00
md_5
6958c35844 Clean up the first two API patches 2013-06-02 10:45:39 +10:00
Renamed from Bukkit-Patches/0001-Spigot-POM-Changes.patch (Browse further)