Commit Graph

1482 Commits

Author SHA1 Message Date
BillyGalbreath
16d318fed6 Revert commit 74e1f208 2021-06-18 09:44:20 -05:00
BillyGalbreath
74e1f2084f wtf 2021-06-17 20:15:06 -05:00
BillyGalbreath
7b9807de96 Merge branch 'ver/1.17' of github.com:pl3xgaming/Purpur into ver/1.17 2021-06-17 20:09:12 -05:00
BillyGalbreath
c8d6f33b0a progress 2021-06-17 20:05:39 -05:00
Ben Kerllenevich
481bfe3eae Revert "more patches"
This reverts commit 362462f699.
2021-06-17 20:45:40 -04:00
Ben Kerllenevich
362462f699 more patches 2021-06-17 20:44:06 -04:00
Ben Kerllenevich
fa4d6d5ee0 Merge branch 'ver/1.16.5' into ver/1.17 2021-06-17 19:45:43 -04:00
Ben Kerllenevich
6a226a29d7 thanks YourKit! 2021-06-17 19:44:32 -04:00
BillyGalbreath
321c252f05 progress 2021-06-17 15:30:00 -05:00
Ben Kerllenevich
02377a8ecd WOAH WERE HALFWAY THERE 🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉 2021-06-17 11:22:10 -04:00
Ben Kerllenevich
b3f8037c18 6 more 2021-06-17 10:39:48 -04:00
Ben Kerllenevich
90faff263b 6 2021-06-17 10:18:32 -04:00
Ben Kerllenevich
d9a75665da 9 2021-06-17 09:42:14 -04:00
Ben Kerllenevich
8cdbb4d898 3 more patches 2021-06-17 08:56:42 -04:00
Jason Penilla
95510fad10 Update "Add canSaveToDisk to Entity" 2021-06-17 03:26:16 -07:00
Jason Penilla
59b4ddb86e Update author on my patches 2021-06-17 03:11:01 -07:00
BillyGalbreath
6df0286ff0 update paper 2021-06-16 18:03:37 -05:00
BillyGalbreath
d7fdc8ace3 fix misspelling 2021-06-16 17:21:21 -05:00
BillyGalbreath
82ef35225f progress 2021-06-16 17:17:33 -05:00
BillyGalbreath
359d49f4f4 update paper 2021-06-16 16:05:02 -05:00
Ben Kerllenevich
4a18cb965b its 3 patches this time 2021-06-16 12:06:52 -04:00
Ben Kerllenevich
3369c2c1a6 you guessed it, another 6 2021-06-16 11:23:56 -04:00
Ben Kerllenevich
81a6f20927 another 6 bite the dust 2021-06-16 10:50:45 -04:00
Ben Kerllenevich
8b92722f4f another six 2021-06-16 10:24:52 -04:00
Ben Kerllenevich
09a8635c4b 🎉🎉 1/4 OF THE PATCHES ARE DONE 🎉🎉 2021-06-16 10:00:13 -04:00
Ben Kerllenevich
f22ef7a241 6 more 2021-06-16 09:27:25 -04:00
Ben Kerllenevich
e4dd7cdae7 six more patches 2021-06-16 08:34:02 -04:00
Ben Kerllenevich
7447eb7020 six patches 2021-06-16 07:50:20 -04:00
Ben Kerllenevich
8489c54fc8 start work today 2021-06-16 07:09:03 -04:00
Ben Kerllenevich
7c6752fe1d update paper 2021-06-16 06:35:33 -04:00
Ben Kerllenevich
3d79a61a25 pain is all i know 2021-06-15 20:47:29 -04:00
Ben Kerllenevich
ba6654e6de add missing purpur commit 2021-06-15 19:33:59 -04:00
Ben Kerllenevich
9d38ee3371 oh my god im having so much fun 2021-06-15 19:32:22 -04:00
Ben Kerllenevich
ae7bdcb443 work it work it 2021-06-15 18:30:10 -04:00
BillyGalbreath
9b2e6cbebc progress 2021-06-15 16:25:36 -05:00
BillyGalbreath
c6d08e65a0 slow progress 2021-06-15 14:28:57 -05:00
BillyGalbreath
a1416734d5 fix mcdev imports 2021-06-15 12:48:49 -05:00
Ben Kerllenevich
bb3ecf9e62 MC DEV 2021-06-15 13:35:58 -04:00
Ben Kerllenevich
ab124e45f4 switch to fork of paperweight
don't worry paperweight/paper devs, this *will* maintain api compatibility, its mainly so we can have files in NMS
2021-06-15 13:17:41 -04:00
Ben Kerllenevich
93a374608a no longer remapping automatically
time to remake every patch by hand... wooo
2021-06-15 12:38:44 -04:00
Ben Kerllenevich
ee17996f78 now we wait
now we have to wait until i figure out how to import mc dev stuff
2021-06-15 10:30:10 -04:00
Ben Kerllenevich
f56d4ee1e2 port patches
i did this by hand because i can't figure out papers remapPatches for the life of me
i need a better way for this
2021-06-15 09:52:00 -04:00
Ben Kerllenevich
8943567163 update api 🎉 2021-06-15 09:28:24 -04:00
Ben Kerllenevich
ab1f8ba489 update stuff 2021-06-15 07:42:35 -04:00
Ben Kerllenevich
23b935c3a2 properly remove tuinity 2021-06-14 17:32:55 -04:00
Ben Kerllenevich
6c12392439 remove forking mojangapi (not needed) 2021-06-14 10:19:10 -04:00
Ben Kerllenevich
045bc40797 remove useless entries 2021-06-14 08:04:38 -04:00
Ben Kerllenevich
9594706f95 add .gitignore to Purpur-MojangAPI 2021-06-14 08:03:31 -04:00
Ben Kerllenevich
63a6a36c4f update pull_request.yml 2021-06-14 07:45:53 -04:00
Ben Kerllenevich
3165d5cc7a push work 2021-06-14 07:28:25 -04:00