Josh Roy
983b5e1680
need to look at this later, fails rn
2021-06-14 06:47:04 -07:00
Josh Roy
c5794c5351
even MOAR progress
2021-06-14 06:45:16 -07:00
Aurora
c5210433c1
Merge branch 'dev/1.17' of github.com:PaperMC/Paper into dev/1.17
2021-06-14 14:04:57 +02:00
Aurora
578ec8c6fe
more work work work
2021-06-14 12:42:08 +02:00
Jason Penilla
8865f5811d
fix issue in hopper patch
2021-06-14 03:18:42 -07:00
Aurora
b018b48e2c
Merge branch 'dev/1.17' of github.com:PaperMC/Paper into dev/1.17
2021-06-14 12:13:18 +02:00
Aurora
52bc694983
more work uwu
2021-06-14 11:46:59 +02:00
Jason Penilla
eb75bb7c8d
decomp fixes
2021-06-14 02:15:37 -07:00
Jason Penilla
d38930d51e
Add missing getLevel implementation to Hopper Minecart, add mapping to fix reobf
2021-06-14 02:06:46 -07:00
Jake Potrebic
97f581f459
more patches ( #5827 )
...
* more patches
* even moar patches
2021-06-14 01:37:14 -07:00
Jake Potrebic
111c52e314
add entity debug info patch back
2021-06-13 23:41:01 -07:00
Jake Potrebic
6cb2a55e24
Add back incremental chunk saving patch
2021-06-13 22:34:40 -07:00
Jason Penilla
7007f67ebb
patches
2021-06-13 23:45:29 -07:00
mechoriet
a61429bdcf
ReAdded PreCreatureSpawnEvent from removed ( #5814 )
2021-06-14 07:40:21 +02:00
Jake Potrebic
238b049489
Re-add xp orb merging patches ( #5823 )
2021-06-13 22:37:57 -07:00
Jason Penilla
3390082ea7
progress
2021-06-13 22:32:56 -07:00
Jason Penilla
4fb248cd77
2 patch
2021-06-13 21:27:51 -07:00
Omer Uddin
0670cfd66f
fix exception ( #5822 )
2021-06-14 00:29:25 -04:00
Jason Penilla
d465800774
small fixes
2021-06-13 20:06:11 -07:00
Jason Penilla
8b23cde79f
reorder patches after merge
2021-06-13 19:43:29 -07:00
Jason Penilla
d6cfd79fb2
patches
2021-06-13 19:40:12 -07:00
Omer Uddin
c946bcff39
work work ( #5821 )
2021-06-13 22:41:44 -04:00
Jason Penilla
24cd075f4e
Use correct jetbrains annotations
2021-06-13 18:48:31 -07:00
Jake Potrebic
ddb72c221d
EVEN MOOOOOAAAAAAARRRRRRR patches :) ( #5820 )
2021-06-13 18:06:38 -07:00
MiniDigger | Martin
9a87139683
fix tests
2021-06-14 02:19:51 +02:00
MiniDigger | Martin
114713030c
not even checkstyle can help us now
2021-06-14 01:48:04 +02:00
MiniDigger | Martin
865f430ea4
use local class for movecontrol stuff to prevent reobf mapping issue
2021-06-14 01:19:51 +02:00
Jake Potrebic
3ee043dc0c
MOAR PATCHES
2021-06-13 15:05:18 -07:00
Jake Potrebic
7dd2ea0897
more patches
2021-06-13 12:29:58 -07:00
MiniDigger | Martin
6358589ae3
adjust material set tag sizes
...
MC added a buuuunch of stuff
2021-06-13 20:34:14 +02:00
Professor Bloodstone
06da1d1d48
Fix recursive connection call causing StackOverflowException
...
This was probably caused by the rename sendPacket->send and dispatchPacket->sendPacket
2021-06-13 18:25:59 +02:00
Aurora
713d787f98
even more work
2021-06-13 16:14:18 +02:00
Aurora
fb2577e08a
more work
2021-06-13 15:46:28 +02:00
Nassim Jahnke
dfe0ef7ab1
Fix compile
2021-06-13 14:54:37 +02:00
Nassim Jahnke
7ff9e98d2a
Move this back
2021-06-13 14:44:31 +02:00
Nassim Jahnke
1325ad102a
More more work
2021-06-13 14:43:56 +02:00
Nassim Jahnke
8521fdc840
More work
2021-06-13 13:40:34 +02:00
Nassim Jahnke
43227a418f
Work
2021-06-13 11:41:07 +02:00
Jason Penilla
bda639725b
fix compile
2021-06-13 01:45:29 -07:00
Jason Penilla
21e2a4d210
patch
2021-06-13 01:40:50 -07:00
Jason Penilla
4ec60d8958
patches and patches
2021-06-13 01:26:58 -07:00
Jason Penilla
9a7acfee26
patches
...
fix
2021-06-12 23:48:25 -07:00
Jason Penilla
249afad373
patches
2021-06-12 22:09:48 -07:00
Jason Penilla
9d21369fb9
Merge remote-tracking branch 'leaf/dev/1.17' into dev/1.17
2021-06-12 21:35:43 -07:00
Spottedleaf
e42c200583
wor
2021-06-12 21:25:07 -07:00
Spottedleaf
09721118a4
even even even even more work
2021-06-12 21:03:02 -07:00
Jason Penilla
266a44e61c
Resolve run working directory from rootProject
2021-06-12 20:35:03 -07:00
Jason Penilla
4b48806b39
Use forUseAtConfigurationTime()
for run directory property
2021-06-12 20:21:59 -07:00
Jason Penilla
744ca73135
Use mergeServiceFiles()
instead of AppendingTransformer
2021-06-12 19:23:21 -07:00
Jason Penilla
ec859f1f2f
Add runWorkDir
property for setting a custom run task working directory
2021-06-12 19:18:24 -07:00
Spottedleaf
6690975133
wowe
2021-06-12 19:16:10 -07:00
Jason Penilla
3a7b3b35c3
Write API version to pom.properties for Versioning to read
...
Maven writes this metadata normally, but we don't use maven. Maybe should modify Versioning instead in the future, but this works just fine for now.
2021-06-12 18:28:41 -07:00
Jake Potrebic
10882402df
more patches ( #5811 )
2021-06-12 16:45:00 -07:00
Jake Potrebic
4423b4ba08
more patches
2021-06-12 14:31:35 -07:00
Jake Potrebic
6adb418b32
more patches ( #5808 )
2021-06-12 12:30:37 -07:00
MiniDigger | Martin
3dbcf242c6
Fix this stupid bullshit v2
2021-06-12 19:13:23 +02:00
Jake Potrebic
3aae52d6f5
more patches ( #5807 )
2021-06-12 09:56:13 -07:00
Aurora
264337e396
even more wooooooooooooooooooooooooork uwu
2021-06-12 17:06:20 +02:00
Nassim Jahnke
3a483825e0
More more more work
2021-06-12 14:58:17 +02:00
Nassim Jahnke
21c7efe18c
Fix patch, fix .gitattributes file name
2021-06-12 14:09:11 +02:00
Nassim Jahnke
3f41a42781
More more work
2021-06-12 13:18:01 +02:00
Nassim Jahnke
d937034264
More work
2021-06-12 12:26:21 +02:00
Spottedleaf
6d2c131449
even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even
...
more work
2021-06-12 02:17:20 -07:00
Spottedleaf
1c0fdc2824
even even even even even even even even even even even
...
even even even even even even even even even even
even even even even even even even even even even
even even even even even even even even even even
even even even even even even even even even even
even even even even even even even even even even
even even even even even even even even even even
more work
2021-06-12 02:01:04 -07:00
MiniDigger | Martin
86213ac1d2
fix profile cache mappings
...
let me be OP god dammit!
2021-06-12 09:30:37 +02:00
Spottedleaf
0891c7ab48
even even even even even even even even even more changes
2021-06-12 00:24:28 -07:00
Spottedleaf
4257a725ae
even even even even even even even more work
2021-06-11 23:24:50 -07:00
Spottedleaf
4b66e6c02d
even even more progress
2021-06-11 23:02:49 -07:00
Spottedleaf
c6393c4571
even more progress
2021-06-11 22:20:08 -07:00
Spottedleaf
4edc9d91ac
some patches
2021-06-11 21:38:04 -07:00
Jake Potrebic
f1f57bd8e5
fix PlayerUseUnknownEntityEvent patch ( #5800 )
2021-06-11 20:37:02 -07:00
Jason Penilla
961d6d7dac
patches
2021-06-11 20:07:57 -07:00
Jason Penilla
25eea26621
Add ASM dep to API and fix issues from title packet changes with bungee api
2021-06-11 19:23:18 -07:00
Jake Potrebic
51d9594fe8
more patches ( #5799 )
2021-06-11 19:24:43 -07:00
Jake Potrebic
bfc788437f
more patches
2021-06-11 17:57:04 -07:00
Jake Potrebic
cf306c3a89
more patches
2021-06-11 15:37:16 -07:00
Jake Potrebic
892f7a57ec
rebase
2021-06-11 13:42:57 -07:00
Jake Potrebic
469a257947
fix adventure patch
2021-06-11 12:23:46 -07:00
Jason Penilla
5db334f804
Add Paper version back to manifest, add runShadow
, runReobf
, and runDev
tasks for testing
2021-06-11 18:10:12 -07:00
MiniDigger | Martin
ee5185e59f
few fixes to make it actually run
2021-06-12 02:22:53 +02:00
Mariell Hoversholm
ceecde4a32
fix: the server compiles
...
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 20:33:36 +02:00
Mariell Hoversholm
041a42e0e4
fix: closer to compilable
...
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 20:26:56 +02:00
Mariell Hoversholm
725ba53b4b
fix: remove #isStopping check
...
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 20:16:11 +02:00
Mariell Hoversholm
5fe78fe2b1
fix: remove empty java file
...
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 20:08:26 +02:00
Mariell Hoversholm
08ced2fad8
fix: add pom changes to gradle
...
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 20:06:01 +02:00
Jake Potrebic
8d1e866fcd
Update Timings patch ( #5796 )
2021-06-11 11:02:16 -07:00
Mariell Hoversholm
ee3cf8cc09
More remapped patches
...
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 17:52:05 +02:00
Mariell Hoversholm
66b67abbef
Apply a few more patches
...
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 15:46:25 +02:00
Mariell Hoversholm
aafaccad78
Rename POM changes to build system changes
...
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 14:33:08 +02:00
Mariell Hoversholm
656297e209
Remap POM changes patch
...
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 14:31:17 +02:00
MiniDigger | Martin
95d25d98e8
Move patches around
2021-06-11 14:02:28 +02:00