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

2506 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sollace
1b688ac9f4
Only load these if the mod is present 2024-02-08 22:17:16 +00:00
Sollace
d06d2680b6
Only load these if the mod is present 2024-02-08 22:16:50 +00:00
Sollace
9ee9e53f63
Fix resource loading errors 2024-02-08 22:16:40 +00:00
Sollace
48be331a21
Update reach-entity-attributes 2024-02-08 22:07:50 +00:00
Sollace
3a5fb82a29
Merge branch '1.20.2' into 1.20.4 
# Conflicts:
#	src/main/java/com/minelittlepony/unicopia/block/BlockConstructionUtils.java
#	src/main/java/com/minelittlepony/unicopia/block/SpikesBlock.java
#	src/main/java/com/minelittlepony/unicopia/block/UBlocks.java
#	src/main/java/com/minelittlepony/unicopia/block/ZapBlock.java
#	src/main/java/com/minelittlepony/unicopia/block/zap/BaseZapAppleLeavesBlock.java
#	src/main/java/com/minelittlepony/unicopia/block/zap/ZapAppleLeavesBlock.java
#	src/main/java/com/minelittlepony/unicopia/block/zap/ZapAppleLeavesPlaceholderBlock.java
#	src/main/java/com/minelittlepony/unicopia/block/zap/ZapAppleLogBlock.java
 2024-02-08 20:43:57 +00:00
Sollace
5cc612ca3a
Merge branch '1.20.1' into 1.20.2 
# Conflicts:
#	src/main/java/com/minelittlepony/unicopia/client/minelittlepony/BodyPartGear.java
#	src/main/java/com/minelittlepony/unicopia/client/minelittlepony/Main.java
#	src/main/java/com/minelittlepony/unicopia/compat/emi/Main.java
#	src/main/java/com/minelittlepony/unicopia/item/URecipes.java
#	src/main/java/com/minelittlepony/unicopia/server/world/UnicopiaWorldProperties.java
 2024-02-08 20:16:46 +00:00
Sollace
5ed68fca7f
Added zap fence and zap fence gate 2024-02-08 19:56:41 +00:00
Sollace
400bc19d08
Added zap planks, stairs, and slabs 2024-02-08 16:56:32 +00:00
Sollace
c4ab7e1bdf
Zap logs can now be waxed to keep them from zapping you when you mine them 2024-02-08 15:19:41 +00:00
Sollace
17cd097d88
Move recipes 2024-02-08 15:06:51 +00:00
Sollace
a0d6c41088
Fixed zap apple logs not placing correctly 2024-02-08 14:59:04 +00:00
Sollace
4aa088ec1b
Fix invalid traits 2024-02-08 14:53:05 +00:00
Sollace
2d7eca4d5b
Zap leaves now drop zaplings 2024-02-08 14:38:59 +00:00
Sollace
6fd124ed81
Fixed zap blocks destroying item drops 2024-02-08 14:25:40 +00:00
Sollace
adb07cc586
Add spectral_clock, curing_joke, and flowering_zap_leaves to the creative tabs for respective tribes 2024-02-08 14:23:26 +00:00
Sollace
660973371d
Fixed stripped zap logs and wood not dropping 2024-02-08 14:22:52 +00:00
LingVarr
476d779b3d Update ru_ru.json 2024-02-08 00:15:58 +11:00
Sollace
b467aae7b2
Fixed bulb attacking players in creative and spectator mode 2024-02-07 13:02:20 +00:00
Sollace
7b78cbc49c
Magic shields now use the pony's horn colour and change shape when extending 2024-02-07 12:54:23 +00:00
Sollace
36e22f1ead
Improve network syncing of spells and fix some shield radius resets 2024-02-07 12:24:53 +00:00
Sollace
5fb54aa2fd
Fixed changeling wing animations and posing 2024-02-07 10:56:13 +00:00
Sollace
2b2fab2303
Fix changeling climbing on ladders and scaffolding #248 2024-02-07 10:55:58 +00:00
Sollace
8d736befa5
Fixed the king sombra boss fight 2024-02-06 16:39:20 +00:00
Sollace
1fdf88dce7
Strip alicorn amulet effects when doing the mind swap spell 2024-02-06 16:39:20 +00:00
Sollace
2f68d4409a
Add sculk events when the bulb roars and kirin rage 2024-02-06 16:39:20 +00:00
Sollace
afe44d0ca1
Fixed the death message when being killed by a kirin raging 2024-02-06 16:39:20 +00:00
Sollace
c30ef7e9c1
Give spikes their own damage type 2024-02-06 16:39:20 +00:00
Sollace
f3f38aae7b
Fix shields, fix black holes being offset, and remove the maximum cap on black holes sizes 2024-02-06 16:39:20 +00:00
Sollace
4e8f683737
Reduce spawn rates of LITERALLY EVERYTHING 2024-02-06 16:39:20 +00:00
­Sollace
1b5910aab1
Merge pull request #252 from LingVarr/1.20.1 
Update ru_ru.json
 2024-02-05 19:01:56 +00:00
LingVarr
4e57272470 Update ru_ru.json 2024-02-06 00:33:35 +11:00
­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