3273 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Sollace	7d48821770	Adjust food balancing and create separate categories for fruit and baked goods, ... fix desserts and candy showing as fruits and vegetables in tooltips fix farmers delight dessert items not being part of the dessert category #293	2024-03-03 16:06:06 +00:00
Sollace	385c412a9d	Don't harm entities the pegasus is carrying when doing a rainboom	2024-03-03 14:15:45 +00:00
Sollace	5348e12aca	Fix #290 and exclude spectators from being affected by magic	2024-03-03 14:15:20 +00:00
Sollace	308cb721cd	Separate the magic beam into its own entity	2024-03-03 14:07:36 +00:00
Sollace	3165f3cd2a	Fix some rendering issues with filled jars	2024-03-03 12:45:53 +00:00
Sollace	2d2a6e9b32	Fixed fruit tree growth + use bonemeal to grow apples	2024-03-03 12:23:42 +00:00
Sollace	b1aaba6eec	Merge branch '1.20.2' into 1.20.4	2024-03-02 18:13:05 +00:00
Sollace	e1df02bdf7	Merge branch '1.20.1' into 1.20.2	2024-03-02 18:11:59 +00:00
Sollace	3a44b9605f	Add submodule file	2024-03-02 18:10:58 +00:00
Sollace	6521262e78	Merge branch '1.20.2' into 1.20.4	2024-03-02 17:28:58 +00:00
Sollace	829a57d00d	Merge branch '1.20.1' into 1.20.2	2024-03-02 17:28:33 +00:00
JCM	e03fa2f564	Make the Friendship Bracelet work for the Pegasus Rainboom Ability	2024-03-02 17:26:25 +00:00
­Sollace	53984c3346	Merge pull request #288 from LingVarr/1.20.1 ... Update ru_ru.json	2024-03-02 17:08:51 +00:00
Sollace	89aeb3903f	Fix #287	2024-03-02 17:08:17 +00:00
LingVarr	713fde35f0	Update ru_ru.json	2024-03-03 03:40:50 +11:00
Sollace	65e4f4fe90	Update blockus	2024-03-02 16:25:04 +00:00
Sollace	67caa81a07	Merge branch '1.20.2' into 1.20.4	2024-03-02 15:48:20 +00:00
Sollace	75d41c1468	Bump blockus	2024-03-02 15:40:07 +00:00
Sollace	1e02de30c4	Merge branch '1.20.1' into 1.20.2	2024-03-02 15:12:35 +00:00
Sollace	58b134577f	Update blockus ref	2024-03-02 15:12:15 +00:00
Sollace	f4b607346a	Merge branch '1.20.1' into 1.20.2	2024-03-02 15:01:32 +00:00
Sollace	b6f71400a9	Update blockus addon	2024-03-02 15:01:11 +00:00
Sollace	2f74a90afc	Le fixes	2024-03-02 00:35:23 +00:00
Sollace	06015ee10b	Bump blockus addon	2024-03-01 23:28:25 +00:00
Sollace	df0cc6d225	Allow for placing our saplings in flower pots	2024-03-01 23:28:25 +00:00
­Sollace	d408f82785	Merge pull request #284 from Cryghast/1.20.1 ... update zh_cn.json	2024-03-01 14:56:20 +00:00
Cryghast	f0f02b478f	update zh_cn.json	2024-02-29 23:12:53 +08:00
Sollace	975f49d390	Create blockus addon	2024-02-28 20:56:57 +00:00
Sollace	e21cffcf7d	Butterflies will now follow the player if they're holding a flower	2024-02-27 21:21:08 +00:00
Sollace	aa00b1a9b0	Fixed shields rendering on players in the inventory screen	2024-02-27 21:20:50 +00:00
Sollace	e03fb016d5	Fixed shields not deflecting projectiles	2024-02-27 21:20:33 +00:00
Sollace	9c71272def	Only interact with the datatracker after it's safe to do so	2024-02-27 00:01:22 +00:00
Sollace	ba2e673de7	Each butterly type has its own item and throwing a butterfly in a jar will spawn a butterfly of that type where it lands	2024-02-26 23:05:30 +00:00
Sollace	8a2463d0a8	You can now safely collect slime pustules with shears and silk touch tools	2024-02-26 23:04:38 +00:00
Sollace	5d7227f547	Fixed frozen effect rendering on boats when sodium is installed	2024-02-26 21:22:18 +00:00
Sollace	850aa8a9fd	Fixed chilling breath spell	2024-02-26 20:56:22 +00:00
Sollace	58561a5eea	Reduce the space requirement for the sour apple saplings	2024-02-26 20:47:39 +00:00
Sollace	7ba42552a4	Merge branch '1.20.2' into 1.20.4	2024-02-24 16:31:33 +00:00
Sollace	1c88d47e7b	Merge branch '1.20.1' into 1.20.2 ... # Conflicts: # gradle.properties	2024-02-24 16:30:51 +00:00
Sollace	0ba987159f	Prevent delta from becoming infinity or nan when duration is 0	2024-02-24 16:22:41 +00:00
Sollace	f9711b9043	Add error messages when lerping nan values	2024-02-24 16:09:02 +00:00
Sollace	450eee5fe6	Downgrade for quilt compatibility	2024-02-24 14:22:28 +00:00
Sollace	5e7526d2ae	Merge branch '1.20.2' into 1.20.4 ... # Conflicts: # gradle.properties	2024-02-24 13:55:06 +00:00
Sollace	3f475c693b	Update minelp	2024-02-24 13:50:45 +00:00
Sollace	e2de87bc0e	Merge branch '1.20.2' into 1.20.4 ... # Conflicts: # gradle.properties # gradle/wrapper/gradle-wrapper.properties # src/main/java/com/minelittlepony/unicopia/block/FruitBearingBlock.java	2024-02-24 13:50:09 +00:00
Sollace	07bf99fcac	Merge branch '1.20.1' into 1.20.2 ... # Conflicts: # gradle.properties	2024-02-24 13:32:29 +00:00
Sollace	3606c5b0f2	Fixed mobs not being able to wear the amulets when trinkets is present	2024-02-24 13:06:32 +00:00
Sollace	4b66dd517f	Fixed leaves rendering weird with sodium and fast graphics	2024-02-22 00:49:21 +00:00
Sollace	a11f8d33eb	Fixed clients slinging sneaky superfluous flight control packets. Fixes #267	2024-02-22 00:04:39 +00:00
Sollace	672807e343	Nerf leaves. Fixes #270	2024-02-21 23:22:28 +00:00