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 |
|
Myles
|
86af7f054a
|
Merge pull request #1601 from KennyTV/abstraction
Cleanup some block rewrite methods
|
2020-01-06 14:56:17 +00:00 |
|
Myles
|
a6932bb71f
|
Merge pull request #1617 from KennyTV/channelnames
Make plugin channel mappings modifiable
|
2020-01-06 14:55:38 +00:00 |
|
KennyTV
|
3384b6bc17
|
Only load mappings file from dir if manually copied
|
2020-01-06 10:52:42 +01:00 |
|
KennyTV
|
4bdb566fb5
|
Kept the wrong defaults
|
2020-01-05 21:23:40 +01:00 |
|
KennyTV
|
5ad62a03ed
|
Make plugin channel mappings modifiable
|
2020-01-05 21:21:58 +01:00 |
|
KennyTV
|
280b6fae2a
|
Merge master
|
2019-12-21 19:49:18 +01:00 |
|
Myles
|
e07c994ddc
|
Merge pull request #1599 from KennyTV/master
Fix Bungee injection on Java 12+
|
2019-12-21 07:18:23 +00:00 |
|
KennyTV
|
5d974858fe
|
Some more cleanup
|
2019-12-20 17:53:14 +01:00 |
|
KennyTV
|
5cb5992d44
|
Fix Bungee injection on Java 12+
Fixes #1512
|
2019-12-20 16:35:10 +01:00 |
|
KennyTV
|
fddbeda81e
|
Back to snapshot
|
2019-12-20 16:29:10 +01:00 |
|
KennyTV
|
1c1ec10a0a
|
Common methods for block rewriting
|
2019-12-17 18:29:38 +01:00 |
|
Myles
|
cd9566fbc8
|
1.15.1 support
|
2019-12-17 15:28:43 +00:00 |
|
KennyTV
|
90b88f3cbf
|
Update readme
|
2019-12-17 15:03:06 +01:00 |
|
Myles
|
faf86b2439
|
Merge pull request #1590 from KennyTV/dev
1.15.1
|
2019-12-17 13:59:06 +00:00 |
|
KennyTV
|
5a1dadf476
|
1.15.1
|
2019-12-17 14:54:51 +01:00 |
|
Myles
|
6eabb17f67
|
Merge from master
|
2019-12-15 09:16:53 +00:00 |
|
Myles
|
4f72edeaee
|
Merge branch 'master' into dev
|
2019-12-15 09:02:48 +00:00 |
|
Myles
|
b0f3d04439
|
Merge branch 'master' of https://github.com/ViaVersion/ViaVersion
|
2019-12-15 09:02:03 +00:00 |
|
Myles
|
33a34fc149
|
Update README with new table
|
2019-12-15 09:01:49 +00:00 |
|
Myles
|
679f573444
|
Merge pull request #1587 from robinbraemer/patch-1
fix typo
|
2019-12-15 09:00:37 +00:00 |
|
Robin Brämer
|
f35b931004
|
fix typo
|
2019-12-14 22:01:50 +01:00 |
|
Myles
|
7ca50291e3
|
Merge pull request #1585 from KennyTV/master
Fix book edit
|
2019-12-14 16:34:57 +00:00 |
|
KennyTV
|
9c8a8e2e9c
|
Fix book edit
|
2019-12-14 16:22:24 +01:00 |
|
Myles
|
d45a370a4d
|
Merge pull request #1527 from creeper123123321/primitive_types
Use primitive types in Position and BlockFace, remove world block con…
|
2019-12-13 12:48:36 +00:00 |
|
Myles
|
d5907711e1
|
Merge pull request #1576 from astei/remove-unneeded-indirection
Remove unneeded indirection
|
2019-12-13 08:30:22 +00:00 |
|