Dylan K. Taylor
111f4b3778
Merge commit '2b6dcbc2e2f1dc8d629225c19cbcedfb9ae969c4'
...
# Conflicts:
# resources/vanilla
2020-06-26 18:46:29 +01:00
Dylan K. Taylor
4c51f1dda3
Scrap TextContainer, make TranslationContainer immutable
...
TextContainer provided zero real value as a base of TranslationContainer, given that it required its own logic to be handled wherever accepted. As such, it's no better than a simple string.
Removing it also allows fixing an ambiguity when embedding translations inside other translations, allowing it to be made immutable.
2020-02-08 13:38:27 +00:00
Dylan K. Taylor
fb1126797a
Merge branch 'stable'
2020-02-07 18:13:55 +00:00
Dylan K. Taylor
cc33c8155f
Language: specify key type for lang and fallbackLang fields
2020-02-01 20:20:39 +00:00
Dylan K. Taylor
ff63f6d055
fill in more iterable types (master)
2020-02-01 20:19:57 +00:00
Dylan K. Taylor
cb16f5c142
Merge commit '260ac47588c76a2e6814cfba46773a990fb8c5da'
...
# Conflicts:
# resources/vanilla
# src/Server.php
# src/lang/Language.php
# src/network/mcpe/protocol/AddItemActorPacket.php
# src/network/mcpe/protocol/AddPlayerPacket.php
# src/network/mcpe/protocol/SetActorDataPacket.php
# src/network/mcpe/serializer/NetworkBinaryStream.php
# src/permission/Permission.php
# src/pocketmine/block/Leaves.php
# src/pocketmine/entity/DataPropertyManager.php
# src/pocketmine/entity/Entity.php
# src/pocketmine/item/Banner.php
# src/pocketmine/item/Item.php
# src/pocketmine/level/format/io/LevelProvider.php
# src/pocketmine/level/format/io/LevelProviderManager.php
# src/pocketmine/network/mcpe/protocol/AddActorPacket.php
# src/pocketmine/network/mcpe/protocol/LoginPacket.php
# src/pocketmine/tile/Banner.php
# src/scheduler/BulkCurlTask.php
# src/updater/AutoUpdater.php
# src/utils/Config.php
# src/utils/Utils.php
# src/world/generator/Flat.php
# src/world/generator/Generator.php
2020-01-31 21:07:34 +00:00
Dylan K. Taylor
301460a0ea
Merge commit '8bf469f7fcd428ebc8c3c9b9ab777c79e2824c67'
...
# Conflicts:
# resources/vanilla
# src/lang/Language.php
2020-01-31 19:22:14 +00:00
Dylan K. Taylor
67bcc1c0fb
phpdoc armageddon for master, pass 1
2020-01-22 11:55:03 +00:00
Dylan K. Taylor
3ee6887792
populate remaining missing return types, using native returns where possible
...
this is done separately to stable so that stable changes can be integrated easily using an empty merge.
2020-01-19 10:26:35 +00:00
Dylan K. Taylor
c36377ea5a
Merge branch 'next-minor'
2019-12-12 19:47:12 +00:00
Dylan K. Taylor
5499ac620c
Removed pocketmine subdirectory, map PSR-4 style
2019-07-30 19:14:57 +01:00
Shoghi Cervantes
825656feed
Fixed installer language strings, bumped MCPE build to 5 (already compatible)
2014-06-18 19:23:14 +02:00
Shoghi Cervantes
2385b94ba3
Added PluginBase::getCommand()
2014-03-27 14:56:02 +01:00
Shoghi Cervantes
cbc64462e6
New directory structure. More powerful startup scripts
2014-03-08 04:41:43 +01:00
Shoghi Cervantes
e3f1db0f45
Added Network\Handler namespace
2014-03-06 13:19:00 +01:00
Shoghi Cervantes
c08bf3ef86
Removed code remove comments
2014-03-06 13:16:44 +01:00
Shoghi Cervantes
1694e8622d
Updated installer languages
2014-02-06 11:45:31 +01:00
Shoghi Cervantes
ec70dd476a
Updated Korean, Dutch and Chinese set-up wizard translations
2014-01-25 01:15:56 +01:00
Shoghi Cervantes
c13cc7c91d
Added Chinese, updated Korean, Russian
2014-01-18 20:48:04 +01:00
Shoghi Cervantes
6cf8698826
Updated German
2014-01-16 22:33:50 +01:00
Shoghi Cervantes
718c858632
Added French, updated Korean and German
2014-01-16 16:27:04 +01:00
Shoghi Cervantes
7a2d90c6d0
Updated German, Korean and Japanese
2014-01-16 12:52:10 +01:00
Shoghi Cervantes
ee7d2f4ebf
Updated Japanese
2014-01-16 00:33:39 +01:00
Shoghi Cervantes
b5406af32e
Updated Russian
2014-01-15 23:30:19 +01:00
Shoghi Cervantes
0949734d38
Updated Russian and Italian
2014-01-15 22:36:24 +01:00
Shoghi Cervantes
40bdfd33ac
Added Japanese, Italian
2014-01-15 20:51:38 +01:00
Intyre
c0b247dd72
Update nl_NL.ini
...
Dutch translation fixed
2014-01-15 20:26:34 +01:00
Shoghi Cervantes
f7ac3f5e8a
Updated German
2014-01-15 20:10:57 +01:00
Shoghi Cervantes
36c416fada
Use DejaVu Sans Mono for the MinTTY console
2014-01-15 19:57:46 +01:00
Shoghi Cervantes
e2c678c8a6
Added set-up Wizard
2014-01-15 18:07:35 +01:00
Shoghi Cervantes
d614f3c9da
Revert "New Language Output preparation"
...
This reverts commit 6993528af25d0790b31bcf84cd83bed169aaef12.
2013-06-05 14:22:04 +02:00
Michael Yoo
6993528af2
New Language Output preparation
2013-06-05 21:45:41 +09:30
