mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-07 22:39:43 +00:00
Code Issues Projects Releases Wiki Activity
18,216 Commits 17 Branches 438 Tags
Commit Graph

544 Commits

Author SHA1 Message Date
Dylan K. Taylor
977f9ec497 Merge branch 'stable' 
# Conflicts:
#	composer.lock
#	resources/vanilla
#	src/VersionInfo.php
#	src/pocketmine/block/Podzol.php
 2020-07-21 11:57:24 +01:00
Dylan K. Taylor
7ff6e5895e added missing 3.14.2 changelog 2020-07-13 11:55:08 +01:00
Dylan K. Taylor
da798817b5 Merge branch 'stable' 
# Conflicts:
#	changelogs/3.14.md
#	resources/vanilla
#	src/VersionInfo.php
#	src/entity/Attribute.php
 2020-07-08 11:46:02 +01:00
Dylan K. Taylor
2751c59979 Release 3.14.1 2020-07-08 10:32:07 +01:00
Dylan K. Taylor
5aefdda942 Merge commit 'c616d9bb7c1335f84808bed9c8eef183ad163679' 
# Conflicts:
#	resources/vanilla
#	src/VersionInfo.php
 2020-06-26 19:19:54 +01:00
Dylan K. Taylor
461bc94236 Release 3.14.0 2020-06-26 14:19:02 +01:00
Dylan K. Taylor
81051441ba Release 3.13.1 2020-06-26 12:31:56 +01:00
Dylan K. Taylor
2a9498a4f9 Merge commit 'a90132a30' 
# Conflicts:
#	resources/vanilla
 2020-06-13 11:22:18 +01:00
Dylan K. Taylor
a90132a30e added missing 3.12.6 changelog 2020-06-04 20:38:06 +01:00
Dylan K. Taylor
b58c425189 Merge branch 'next-minor' 
# Conflicts:
#	changelogs/3.12.md
#	resources/vanilla
#	src/VersionInfo.php
 2020-06-03 13:11:30 +01:00
Dylan K. Taylor
c864647cd1 Merge branch 'stable' into next-minor 2020-06-03 13:04:08 +01:00
Dylan K. Taylor
c32026333f Release 3.12.5 2020-06-03 10:59:33 +01:00
Dylan K. Taylor
d36b24c518 Release 3.12.4 2020-06-02 18:40:33 +01:00
Dylan K. Taylor
5c63e06b0f piece together a changelog for release 2020-06-01 14:57:27 +01:00
Dylan K. Taylor
e87e974323 Release 3.12.3 2020-06-01 13:18:28 +01:00
Dylan K. Taylor
ba0dcdb722 Merge commit '71a8b0340c303a4d2c024ad5a0a558c5e52694e7' 
# Conflicts:
#	resources/vanilla
 2020-05-18 20:18:47 +01:00
Twisted
8f5db7c297
3.12.2 changelog typo (#3505) 2020-05-18 12:26:07 +01:00
Dylan K. Taylor
a91e895781 Merge branch 'next-minor' 
# Conflicts:
#	resources/vanilla
#	src/VersionInfo.php
 2020-05-18 10:54:39 +01:00
Dylan K. Taylor
9b6b3f50a1 Release 3.12.2 2020-05-18 10:17:02 +01:00
Dylan K. Taylor
bbc249ff0d Merge branch 'next-minor' 
# Conflicts:
#	composer.lock
#	resources/vanilla
#	src/VersionInfo.php
 2020-05-13 13:54:29 +01:00
Dylan K. Taylor
ded45bddfe Release 3.12.1 2020-05-13 13:10:10 +01:00
Dylan K. Taylor
9bfc1df486 Merge branch 'stable' 2020-04-18 13:19:31 +01:00
Dylan K. Taylor
35be36961d Merge tag '3.11.7' 2020-04-18 11:29:47 +01:00
Dylan K. Taylor
77d45bf116 Release 3.12.0 2020-04-17 18:39:15 +01:00
Dylan K. Taylor
3aa58f54dc Release 3.11.7 2020-04-14 02:54:40 +01:00
Dylan K. Taylor
8a770d837e Merge branch 'stable' 2020-02-24 20:32:43 +00:00
Dylan K. Taylor
778814a35e changelog: fix typo 2020-02-24 20:18:47 +00:00
Dylan K. Taylor
cb9e79b398 Release 3.11.6 2020-02-21 19:18:48 +00:00
Dylan K. Taylor
e1eb9186fe Merge branch 'stable' 2020-02-03 19:57:21 +00:00
Dylan K. Taylor
13e4772f98 Release 3.11.5 2020-02-02 18:31:51 +00:00
Dylan K. Taylor
757f5b2fbf Merge branch 'stable' 2020-01-20 18:12:58 +00:00
Dylan K. Taylor
13f28d8454 Release 3.11.4 2020-01-20 18:06:46 +00:00
Dylan K. Taylor
220b28dd27 Merge commit '27350c4673dff62eed6d52633f4a0c776fdbd60c' 2020-01-09 15:29:39 +00:00
Dylan K. Taylor
0d5704b156 Release 3.11.3 2020-01-04 16:46:55 +00:00
Dylan K. Taylor
cccade9ade Merge branch 'stable' 2019-12-29 15:31:10 +00:00
Dylan K. Taylor
a37d740111 Release 3.11.2 2019-12-29 13:11:30 +00:00
Dylan K. Taylor
a1610500e9 Merge tag '3.11.1' 2019-12-11 23:35:20 +00:00
Dylan K. Taylor
c85c1c3c3f Merge commit '82d9e481d2a0a389fbbc6dfd3672fc366127febc' 2019-12-11 23:06:35 +00:00
Dylan K. Taylor
40a2211a5a Release 3.11.1 2019-12-11 20:20:26 +00:00
Dylan K. Taylor
a386ff8ce7 Release 3.11.0 2019-12-11 18:35:03 +00:00
Dylan K. Taylor
ab628d0254 Merge tag '3.9.8' 2019-12-08 17:49:39 +00:00
Dylan K. Taylor
4eb59c0372 Release 3.10.1 2019-12-07 16:41:41 +00:00
Dylan K. Taylor
d27c7f7141 Release 3.10.0 2019-12-06 20:53:15 +00:00
Dylan K. Taylor
6399dacba7 Release 3.9.8 2019-12-06 20:33:51 +00:00
Dylan K. Taylor
2ff25dfbd2 Color: make mix() first parameter mandatory, closes #3204 2019-12-04 18:39:14 +00:00
Dylan K. Taylor
c16337a80f Merge branch 'stable' with changes 2019-11-09 18:01:04 +00:00
Dylan K. Taylor
0c91d568b4 Release 3.9.7 2019-10-28 16:07:35 +00:00
Dylan K. Taylor
ebbb99b96b Merge branch 'next-minor' 2019-10-22 19:05:11 +01:00
Dylan K. Taylor
d1b70bd400 Release 3.9.6 2019-10-22 14:38:02 +01:00
Dylan K. Taylor
6d24760174 Merge branch 'stable' 2019-10-20 21:25:39 +01:00