KennyTV
a9b3640b69
Merge branch 'master' into abstraction
2020-02-14 15:47:42 +01:00
Myles
17323c715d
Merge pull request #1656 from JLLeitschuh/fix/JLL/use_https_to_resolve_dependencies
...
[SECURITY] Use HTTPS to resolve dependencies in Maven Build
2020-02-11 16:31:27 +00:00
Jonathan Leitschuh
2420b8052e
Use HTTPS instead of HTTP to resolve dependencies
...
This fixes a security vulnerability in this project where the `pom.xml`
files were configuring Maven to resolve dependencies over HTTP instead of
HTTPS.
Signed-off-by: Jonathan Leitschuh <Jonathan.Leitschuh@gmail.com>
2020-02-11 10:46:21 -05:00
KennyTV
5c54e8a08d
Merge branch 'master' into abstraction
2020-02-10 15:55:09 +01:00
Myles
fa220a93eb
Merge pull request #1654 from KennyTV/master
...
Add vines blockconnection to prevent unwanted climbing
2020-02-10 13:58:40 +00:00
KennyTV
7e164b40c7
Add vines blockconnection to prevent unwanted climbing
...
Fixes #1640
2020-02-10 14:50:22 +01:00
Myles
323ceb9ced
Merge pull request #1653 from KennyTV/abstraction
...
Remove deprecated api, remove a bit of magic
2020-02-10 09:10:11 +00:00
KennyTV
681a0dc0e4
Remove deprecated api, remove a bit of magic
2020-02-10 10:05:56 +01:00
Myles
7cbd20a038
Merge pull request #1652 from KennyTV/abstraction
...
Remove a bit of magic, use finals
2020-02-09 12:08:39 +00:00
KennyTV
3f5500c637
Remove a bit of magic, use finals
2020-02-09 13:06:23 +01:00
Myles
7513b0499d
Merge pull request #1650 from KennyTV/abstraction
...
Handle items in cooldown packet
2020-02-08 21:24:45 +00:00
KennyTV
c4b447f7b6
Handle items in cooldown packet
2020-02-08 21:33:44 +01:00
KennyTV
177b0fbf33
Fix particle mapping
2020-02-06 12:37:57 +01:00
Myles
7f5e53782b
Merge pull request #1648 from KennyTV/abstraction
...
20w06a, more cleanup
2020-02-05 19:28:04 +00:00
KennyTV
2184ef19ca
20w06a, more cleanup
2020-02-05 20:09:06 +01:00
Myles
712aa0dbf0
Merge pull request #1647 from KennyTV/abstraction
...
Improvements to 1.11 EntityIdRewriter
2020-02-05 16:07:33 +00:00
KennyTV
c33611d2d3
Cleanup 1.11 entityidrewriter
2020-02-04 15:33:36 +01:00
Jo0001
bf15415185
Add link to krusics "Blocked Version Generator"
2020-02-01 20:26:03 +01:00
Myles
7a38e8ceb9
Merge pull request #1644 from KennyTV/abstraction
...
Minor blockconnection cleanup, reduce map lookups
2020-01-28 14:23:19 +00:00
KennyTV
7f6c429a55
Minor blockconnection cleanup, reduce map lookups
2020-01-28 13:31:36 +01:00
Myles
6eeecb271b
Merge pull request #1638 from KennyTV/abstraction
...
Do not unnecessarily register tasks/listeners, set api-version
2020-01-28 11:38:32 +00:00
Myles
109d5afcf5
Merge pull request #1643 from KennyTV/master
...
Option to (not) remap infested blocks to their normal variants
2020-01-28 11:37:58 +00:00
KennyTV
116706c09f
Option to (not) remap infested blocks to their normal variants
...
Fixes #1642
2020-01-28 12:36:27 +01:00
KennyTV
598b51a4bf
Do not unnecessarily register tasks/listeners
2020-01-22 14:55:39 +01:00
KennyTV
b06b9c69ca
Do not unnecessarily register tasks/listeners
2020-01-22 14:14:43 +01:00
KennyTV
704f946cf7
Merge remote-tracking branch 'origin/master' into abstraction
...
# Conflicts:
# bukkit/pom.xml
# bungee/pom.xml
# common/pom.xml
# jar/pom.xml
# pom.xml
# sponge-legacy/pom.xml
# sponge/pom.xml
# velocity/pom.xml
2020-01-21 16:07:42 +01:00
KennyTV
1ef9dc8de6
2.2.3 Release
2020-01-21 16:07:01 +01:00
KennyTV
f9d10a9571
1.15.2 support
2020-01-21 16:05:26 +01:00
KennyTV
379c5791e6
Merge branch 'master' into dev
2020-01-20 22:15:41 +01:00
KennyTV
8569f47627
Merge branch 'dev' into abstraction
2020-01-19 19:09:57 +01:00
Myles
555bbb550f
Merge pull request #1634 from Gerrygames/dev
...
1.15-pre2
2020-01-16 15:03:34 +00:00
Gerrygames
4cf09f2e34
1.15-pre2
2020-01-16 15:58:35 +01:00
Myles
c9abd745c5
Merge pull request #1633 from KennyTV/abstraction
...
Put translation values into correct map
2020-01-16 09:50:45 +00:00
KennyTV
5d1b8dbb85
Put translation values into correct map
2020-01-16 10:39:31 +01:00
Myles
ebeb1905b3
Merge pull request #1631 from KennyTV/abstraction
...
Convert (general) 1.12.2->1.13 statistics
2020-01-15 21:44:55 +00:00
KennyTV
605b217ba4
Convert (general) 1.12.2->1.13 statistics
2020-01-15 21:51:33 +01:00
KennyTV
814bd9d85e
Merge remote-tracking branch 'origin/master' into abstraction
2020-01-15 19:13:33 +01:00
Myles
8d16ebf6ae
Merge pull request #1630 from KennyTV/master
...
Fix 1.11 evocation id
2020-01-15 17:54:52 +00:00
KennyTV
7f0af23f96
Fix 1.11 evocation id
...
Fixes #1629
2020-01-15 18:53:26 +01:00
Myles
060370f356
Update fabric.mod.json
2020-01-14 20:11:09 +00:00
Myles
ab384df279
Merge branch 'master' into abstraction
2020-01-14 19:14:42 +00:00
Myles
9a0cc02b86
Merge branch 'master' into dev
2020-01-14 19:14:38 +00:00
Myles
5fb86d8df3
*sobs*
2020-01-14 19:14:18 +00:00
Myles
c64c27331a
Merge branch 'master' into dev
2020-01-14 19:12:55 +00:00
Myles
cd2ca76236
Merge branch 'master' into abstraction
2020-01-14 19:12:42 +00:00
Myles
9598e0e4f8
Update authors
2020-01-14 19:12:24 +00:00
Myles
d29c2bdfb7
Merge pull request #1627 from KennyTV/master
...
Fix heightmaps
2020-01-14 18:24:51 +00:00
KennyTV
538b467fa6
Fix heightmaps
2020-01-14 19:18:02 +01:00
Myles
7deca33374
Merge pull request #1626 from Gerrygames/dev
...
1.15.2-pre1 + merge master
2020-01-14 17:07:19 +00:00
Gerrygames
c704813a6c
1.15.2-pre1
2020-01-14 17:51:39 +01:00
