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

2529 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sollace
bb661da35e
Add a LEVEL option to the mana command 2024-02-12 13:27:50 +00:00
Sollace
6465d99e3e
Adjust shield spell shape 2024-02-12 13:27:37 +00:00
Sollace
ae5464b758
Fixed shapeshifting and fixed disguise entities not playing animations 2024-02-12 13:14:40 +00:00
­Sollace
46dcf0802b
Merge pull request #255 from Cryghast/1.20.1 
upadte zh_cn.json
 2024-02-12 06:48:40 +00:00
横刀天笑（Knife smile）
f2bc32a90b
Merge branch 'Sollace:1.20.1' into 1.20.1 2024-02-12 11:30:54 +08:00
Sollace
a9db2490f5
Make common enchantments less common 2024-02-11 20:51:12 +00:00
Sollace
80c31b4a1d
Fix items with heartbound not being restored if it had only 1 enchantment level before dying 2024-02-11 20:31:37 +00:00
Sollace
b28c89e202
Merge branch '1.20.2' into 1.20.4 
# Conflicts:
#	gradle.properties
#	src/main/java/com/minelittlepony/unicopia/server/world/Tree.java
 2024-02-11 15:37:28 +00:00
Sollace
0de1847392
Merge branch '1.20.1' into 1.20.2 
# Conflicts:
#	gradle.properties
 2024-02-11 14:52:56 +00:00
Sollace
623d231f2f
Fix the mimic spell recipe 2024-02-11 14:51:29 +00:00
Sollace
ae0179be8f
Fix compatibility with Synatra Connector / Froge 2024-02-11 14:01:18 +00:00
Cryghast
4644092120 update zh_cn.json 2024-02-11 20:37:18 +08:00
Sollace
18f2865264
Add an option to disable the post-effect shader 2024-02-11 11:01:35 +00:00
Sollace
989d1df294
Add toggles for pehkui and sodium 2024-02-11 00:28:39 +00:00
Sollace
65b468507c
Added flowers to apple tree leaves when they are flowing 2024-02-10 21:56:36 +00:00
Sollace
f8b4238822
Revert the player range check when dropping fruit from trees 2024-02-10 21:09:36 +00:00
Sollace
ded8499e9f
Adjust tree spawn rate and add a sweet apple orchard biome 2024-02-10 18:16:25 +00:00
Sollace
9599d0044b
Update minelp 2024-02-10 18:16:25 +00:00
­Sollace
09abc30c2d
Merge pull request #253 from LingVarr/1.20.1 
Update ru_ru.json
 2024-02-09 11:53:40 +00:00
LingVarr
6586e7625d Update ru_ru.json 2024-02-09 19:12:09 +11:00
LingVarr
dd804c872e
Merge branch 'Sollace:1.20.1' into 1.20.1 2024-02-09 19:00:43 +11:00
Sollace
34566b560e
Add dev dependencies 2024-02-08 22:59:21 +00:00
Sollace
5e099aeea5
Only load these if the mod is present 2024-02-08 22:17:36 +00:00
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