PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-12-01 00:37:59 +01:00
Code Issues Projects Releases Packages Wiki Activity
3125 commits 14 branches 181 tags 44 MiB
Commit graph

3125 commits

This branch
This branch
All branches
Author SHA1 Message Date
­Sollace
2a6d7932c7
Merge pull request #251 from Cryghast/1.20.1 
参考zh_tw修正了一些翻译错误
 2024-02-05 12:26:38 +00:00
­Sollace
aba0526acd
Merge pull request #249 from ltgc-lilac/1.20.1 
Some French and Chinese translations
 2024-02-05 12:26:05 +00:00
Sollace
3d5292c7f3
Add structure previews to the emi recipes for earth ponies, add the spectral clock recipe to emi, and ensure items aren't burned when throwing them into the altar's flame 2024-02-05 12:21:10 +00:00
Sprinkled Frosting
a29a4eb05e 削除無用檔案 2024-02-05 07:08:06 +00:00
Sollace
e48b7bd244
Improve structure rendering performance and change lighting 2024-02-05 00:34:49 +00:00
Cryghast
ad484ee74d 修正了一些翻译错误 2024-02-05 01:05:09 +08:00
Sollace
3b0a64326e
Move mana label to a static 2024-02-04 12:18:06 +00:00
­Sollace
1181399977
Merge pull request #250 from Cryghast/1.20.1 
update zh cn json
 2024-02-04 11:49:12 +00:00
­Sollace
141b67884f
Merge pull request #247 from LingVarr/1.20.1 
Update ru_ru.json (Spellbook!) + fix typos in en_us.json
 2024-02-04 11:48:40 +00:00
LingVarr
7435eed8a9 Update ru_ru.json 2024-02-04 15:59:59 +11:00
LingVarr
b9b2dac114
Merge branch 'Sollace:1.20.1' into 1.20.1 2024-02-04 15:06:26 +11:00
Sollace
f51cb97721
Merge branch '1.20.2' into 1.20.4 2024-02-03 23:20:10 +00:00
Sollace
5af0f73f5c
Merge branch '1.20.1' into 1.20.2 
# Conflicts:
#	src/main/java/com/minelittlepony/unicopia/container/SpellbookChapterLoader.java
#	src/main/java/com/minelittlepony/unicopia/network/MsgZapAppleStage.java
 2024-02-03 23:19:53 +00:00
Sollace
c7a23a19d9
Add pages for the altar and the spectral clock 2024-02-03 23:17:45 +00:00
Sollace
73d4975bf4
Remove extra ice spell page (should be blank) 2024-02-03 23:17:02 +00:00
Sprinkled Frosting
2d00b3ad77 修正 2024-02-03 17:50:07 +00:00
Sprinkled Frosting
4a081f0c9c 基本完成 2024-02-03 17:43:47 +00:00
Sprinkled Frosting
09343e25c7 基本完成了啦雞掰人 2024-02-03 17:28:49 +00:00
Cryghast
ec1fcdb41d 魔咒改成魔法 2024-02-04 01:18:54 +08:00
Lumière Élevé
cfd2d7d42b Gitea 2024-02-03 17:02:55 +00:00
Lumière Élevé
d7dda76ebd What the heck I didn't even pass the first 10% 2024-02-03 16:57:46 +00:00
Sprinkled Frosting
ac9428668a 進度 2024-02-03 16:55:38 +00:00
Sprinkled Frosting
fef9c2bdde 我似乎忘記了一些 2024-02-03 16:26:35 +00:00
Sprinkled Frosting
cd6047ba8e 字幕 2024-02-03 16:22:49 +00:00
Sprinkled Frosting
40975732ce 死亡訊息 2024-02-03 16:04:52 +00:00
Cryghast
1bd3723539 添加了句号 2024-02-03 23:49:28 +08:00
Cryghast
353b0626d9 update zh cn json 2024-02-03 23:27:25 +08:00
Lumière Élevé
1529fa4dd0 Some more stuff. 2024-02-03 15:17:31 +00:00
Lumière Élevé
f97c7b17bd
Merge branch 'Sollace:1.20.1' into 1.20.1 2024-02-03 13:33:29 +00:00
Sprinkled Frosting
408cb8c4a7 種族選擇 2024-02-03 13:16:23 +00:00
Sprinkled Frosting
9209b5dbd3 魔法與食物 2024-02-03 12:47:21 +00:00
Sollace
4230518d08
Make the spectral clock more accurate 2024-02-03 12:42:26 +00:00
Sprinkled Frosting
b9266b047e 熒幕提示 2024-02-03 12:18:36 +00:00
Sprinkled Frosting
da42cadad0 藥水 2024-02-03 12:15:29 +00:00
Sprinkled Frosting
b356d1f888 正體中文實驗 2024-02-03 11:28:00 +00:00
Lumière Élevé
ae730ce8fc Some French translations. 2024-02-03 10:31:05 +00:00
Lumière Élevé
26fc8f9823 Prepare a new file for French translations. 2024-02-03 10:10:02 +00:00
LingVarr
8454ccedd7
Update en_us.json 2024-02-03 13:07:02 +11:00
Sollace
398ed0743d
Merge branch '1.20.2' into 1.20.4 
# Conflicts:
#	src/main/java/com/minelittlepony/unicopia/block/BaseZapAppleLeavesBlock.java
#	src/main/java/com/minelittlepony/unicopia/block/UBlocks.java
#	src/main/java/com/minelittlepony/unicopia/block/ZapAppleLeavesBlock.java
#	src/main/java/com/minelittlepony/unicopia/block/ZapAppleLeavesPlaceholderBlock.java
#	src/main/java/com/minelittlepony/unicopia/container/SpellbookChapterLoader.java
#	src/main/java/com/minelittlepony/unicopia/entity/mob/SpellbookEntity.java
#	src/main/java/com/minelittlepony/unicopia/projectile/PhysicsBodyProjectileEntity.java
 2024-02-02 22:35:42 +00:00
Sollace
466ba09072
Merge branch '1.20.1' into 1.20.2 2024-02-02 21:17:53 +00:00
Sollace
38892ffde4
Remove unused mixin 2024-02-02 21:17:34 +00:00
Sollace
eb4c70de2f
1.20.1 -> 1.20.2 (merge fixes) 2024-02-02 21:17:16 +00:00
Sollace
ad1784b417
Merge branch '1.20.1' into 1.20.2 
# Conflicts:
#	src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/element/Recipe.java
#	src/main/resources/assets/unicopia/lang/zh_cn.json
 2024-02-02 21:08:49 +00:00
Sollace
5a5ec8b24c
Implement method to obtain the spectral clock using the altar 2024-02-02 21:04:20 +00:00
LingVarr
38e2a1c035 Update ru_ru.json 
Spellbook time
 2024-02-02 22:01:54 +11:00
LingVarr
8fd97223ed Fix some typos in en_us.json 
I hope those were typos and not some special irish grammar.
 2024-02-02 22:01:10 +11:00
Sollace
28e64eebe1
Fix incorrect translation string 2024-02-02 08:26:00 +00:00
Sollace
a0ebfbacce
Move the unintelligle stuff to translation strings for LingVarr 2024-02-02 08:23:22 +00:00
Sollace
82428f77b7
Add more stages to the spectral clock 2024-02-02 08:16:33 +00:00
Sollace
7cb8e9c859
Fixed cloud block placement desync when on multiplayer 2024-02-01 23:17:46 +00:00