Unicopia/src/main/java/com/minelittlepony/unicopia
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
..
ability Merge branch '1.20.2' into 1.20.4 2024-02-08 20:43:57 +00:00
advancement 1.20.2 -> 1.20.4 2023-12-30 11:55:26 +01:00
block Merge branch '1.20.2' into 1.20.4 2024-02-08 20:43:57 +00:00
client Merge branch '1.20.2' into 1.20.4 2024-02-08 20:43:57 +00:00
command Merge branch '1.20' into 1.20.2 2023-12-15 20:38:34 +00:00
compat Merge branch '1.20.1' into 1.20.2 2024-02-08 20:16:46 +00:00
container Merge branch '1.20.2' into 1.20.4 2024-02-08 20:43:57 +00:00
diet 1.20.2 -> 1.20.4 2023-12-30 11:55:26 +01:00
entity Merge branch '1.20.2' into 1.20.4 2024-02-08 20:43:57 +00:00
input Change flight activation to use a double-jump 2023-04-29 22:32:00 +01:00
item Merge branch '1.20.2' into 1.20.4 2024-02-08 20:43:57 +00:00
mixin Merge branch '1.20.1' into 1.20.2 2024-02-02 21:17:53 +00:00
modmenu 1.16.5 -> 1.17 2021-08-04 15:38:03 +02:00
network Merge branch '1.20.2' into 1.20.4 2024-02-08 20:43:57 +00:00
particle Add a dust cloud when earth ponies stomp sand, gravel, and concrete powder 2024-01-31 14:04:29 +00:00
projectile Merge branch '1.20.2' into 1.20.4 2024-02-02 22:35:42 +00:00
server/world Merge branch '1.20.2' into 1.20.4 2024-02-08 20:43:57 +00:00
util Merge branch '1.20.2' into 1.20.4 2024-02-08 20:43:57 +00:00
Affinity.java Fixed gemstones not changing texture to reflect their affinity 2023-05-25 10:28:59 +01:00
Availability.java Added hippogriffs and seaponies 2023-11-08 12:58:41 +00:00
AwaitTickQueue.java Delay scheduled tasks so they don't end up being excuted immediately. Might help prevent crashes like #95 2023-01-28 19:22:20 +00:00
Config.java Add config options for portal rendering 2024-01-27 04:21:31 +00:00
Debug.java Assign traits to a lot of items that needed it 2024-01-29 16:35:21 +00:00
EntityConvertable.java Change cast spells to be easier to reach and change the center to be the center of the entity not its base position 2024-01-25 22:57:44 +00:00
EquineContext.java Some refinements. Cloud block items now float on other cloud blocks 2023-10-21 20:30:13 +01:00
EquinePredicates.java Fixed spells not affecting experience orbs 2024-01-20 16:45:33 +00:00
FlightType.java Fixed alicorn amulet flight not working 2023-10-07 23:44:30 +01:00
InteractionManager.java Fixed cloud block placement desync when on multiplayer 2024-02-01 23:17:46 +00:00
Owned.java Fix shields, fix black holes being offset, and remove the maximum cap on black holes sizes 2024-02-06 16:39:20 +00:00
Race.java Make the seapony transformation into an ability granted if you're wearing the necklace 2023-11-09 16:26:26 +00:00
UGameEvents.java 1.20.1 -> 1.20.2 2023-10-24 00:50:57 +01:00
Unicopia.java New food system: 2023-12-03 02:39:55 +00:00
UnicopiaMixinPlugin.java Force ponies to use the seapony model (if they have one) when they are a seapony in unicopia 2023-11-25 21:27:29 +00:00
UPOIs.java Added an ability for seaponies 2023-11-10 18:14:34 +00:00
USounds.java Added curing joke and ignimeous bulbs 2024-01-03 21:51:24 +01:00
UTags.java Add a dust cloud when earth ponies stomp sand, gravel, and concrete powder 2024-01-31 14:04:29 +00:00
WeaklyOwned.java Fixed unable to place the necromancy spell 2023-08-06 18:26:17 +01:00
WorldConvertable.java Consolodate asWorld() implementations 2022-12-19 19:50:15 +01:00