mirrors/cobblemon
1
0 Fork 1
mirror of https://gitlab.com/cable-mc/cobblemon.git synced 2026-11-13 11:48:53 -05:00
Code Issues Packages Projects Releases Wiki Activity
4,409 Commits 223 Branches 24 Tags
4e9d45d38c19a2f984ecff437df7a1a7db0759d4
Commit Graph
4409 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Waldleufer 4e9d45d38c MutableText.onHover() now is actually drawn if text is being hovered 
#480
 2023-10-22 21:08:15 +02:00
Waldleufer 4e2f7d3bc5 InfoWidget refactored into multiple smaller widgets. 
#480
 2023-10-22 21:08:15 +02:00
Waldleufer 8975b099ad InfoWidget reworked. 
#480
 2023-10-22 21:08:09 +02:00
Waldleufer 308380706a Implemented Hovertext and italicized Nature for Minted Natures in Info and Trade Screen. 
I am sure there is a better way to do that though.

#480
 2023-10-22 21:01:31 +02:00
Hiroku ac76878002 Merge branch 'main' into 'main' 
Simplified composting as well as made mint, apricorn, and berries more consistent.

See merge request cable-mc/cobblemon!710
 2023-10-22 01:13:46 +00:00
Jordan fe219e52e6 Simplified composting as well as made mint, apricorn, and berries more consistent. 2023-10-22 01:13:45 +00:00
Hiroku 156a7a70eb Merge branch 'battle-potion-fix' into 'main' 
Fix Potions, Super Potions, and Hyper Potions not working during Battle

See merge request cable-mc/cobblemon!708
 2023-10-21 02:21:09 +00:00
Hiroku 3b13b9f246 Merge branch 'PlasteredCrab-main-patch-56636' into 'main' 
Update CHANGELOG.md to include Potion use during battle issue

See merge request cable-mc/cobblemon!709
 2023-10-21 02:21:03 +00:00
Plastered_Crab 0a8d920285 Update CHANGELOG.md to include Potion use during battle issue 2023-10-21 02:15:28 +00:00
Plastered_Crab f5418a8088 Update PotionItem.kt to fix Potions, Super Potions, and Hyper Potions not working during Battle 2023-10-21 02:07:00 +00:00
Hiroku cae097bf2c Merge branch 'berry-juice-bowl' into 'main' 
Fixed Berry Juice so bowl is given back to player

See merge request cable-mc/cobblemon!706
 2023-10-21 01:56:36 +00:00
Hiroku f760003c3a Merge branch 'PlasteredCrab-main-patch-58336' into 'main' 
Update CHANGELOG.md to include Berry Juice changes

See merge request cable-mc/cobblemon!707
 2023-10-21 01:56:17 +00:00
Plastered_Crab 38f70c5960 Update CHANGELOG.md to include Berry Juice changes 2023-10-21 01:55:00 +00:00
Plastered_Crab 81b00d7f85 Fixed Berry Juice so that when it is used in and outside of Battle when in Survival Mode a wooden bowl is given back to the player 2023-10-21 01:47:43 +00:00
Paul 948ceeaa8d Merge remote-tracking branch 'origin/main' 2023-10-21 10:14:25 +10:00
Paul 1eda446897 Fixed bad PC loading from JSON and NBT store adapters due to 392b6993 2023-10-21 10:14:15 +10:00
Licious c5d254cca7 Merge branch 'Berries-On-Modded-Farmland' into 'main' 
Allow Berries on Modded Farmland

See merge request cable-mc/cobblemon!705
 2023-10-20 20:29:52 +00:00
Charzard4261 d3e10cb570 Merge remote-tracking branch 'origin/Berries-On-Modded-Farmland' into Berries-On-Modded-Farmland 2023-10-20 19:12:34 +01:00
Charzard4261 51d7d2cb04 Added Forge and Fabric (unofficial but according to their standards) farmlands tag to facilitate better compatibility, as advised by Licious. 2023-10-20 19:12:19 +01:00
Charzard4261 ac53d2da95 Merge branch 'main' into 'Berries-On-Modded-Farmland' 
# Conflicts:
#   CHANGELOG.md
 2023-10-20 16:43:45 +00:00
Charzard4261 17e41f5f0b Updated CHANGELOG.md 2023-10-20 17:30:29 +01:00
Charzard4261 4bd70698ce Added a "below.block is FarmlandBlock" check for Berry blocks to allow them to be placed on other blocks that extend from it. 2023-10-20 17:25:57 +01:00
Hiroku d68c912ca6 Merge branch 'Dispenser-Shear-Apricorn-Fix' into 'main' 
Fixed Dispensers being unable to shear grown Apricorns

See merge request cable-mc/cobblemon!701
 2023-10-20 09:32:17 +00:00
Hiroku c391d1a5e0 Merge branch 'main' into 'Dispenser-Shear-Apricorn-Fix' 
# Conflicts:
#   CHANGELOG.md
 2023-10-20 07:42:04 +00:00
Nick 0af39118eb Merge branch 'multi-party-fix' into 'main' 
Allows PlayerPartyStore's to have their own unique storage id, separate from the player uuid.

See merge request cable-mc/cobblemon!704
 2023-10-20 07:21:03 +00:00
Deltric 392b69937f Allows PlayerPartyStore's to have their own unique storage id, separate from the player uuid. 2023-10-20 01:53:32 -05:00
Hiroku e32af733f1 Merge branch 'more-mod-compat' into 'main' 
Fix compatibility with the Forge version of Carry On, add compatibility for Adorn.

See merge request cable-mc/cobblemon!697
 2023-10-20 06:41:13 +00:00
Charzard4261 9ca472ccaf Fixed Dispensers being unable to shear grown Apricorns. 2023-10-19 11:48:27 +01:00
Licious b3255045fa Fix compatibility with the Forge version of Carry On, add compatibility for Adorn. 2023-10-18 22:17:35 +01:00
Hiroku 90f3acebac Merge branch 'main' into 'main' 
Check chunks are loaded before running AreaSpawner

See merge request cable-mc/cobblemon!692
 2023-10-18 20:00:56 +00:00
Nick 0da91fb255 Merge branch 'Miltank-Milk-Revert-Fix' into 'main' 
Fix Miltank Bucket Reversion

See merge request cable-mc/cobblemon!696
 2023-10-18 18:22:23 +00:00
Charzard4261 ba3b26ac74 Fix desync that was causing milk buckets occasionally reverting to regular buckets by removing the ServerClientPlayer check in PokemonEntity.interactMob for Shearing and Milking, and modifying it slightly to be the same calls as CowEntity (minus the SFX). 2023-10-18 17:49:47 +01:00
Xander Forrest 966761776d Merge branch cobblemon:main into main 2023-10-18 10:20:29 +00:00
Nick 24f07c58a0 Merge branch 'fabric-roots-spreading-fix' into 'main' 
Fix Fabric big root spreading.

See merge request cable-mc/cobblemon!695
 2023-10-17 23:06:24 +00:00
Xander Forrest a8b5f649a8 Merge branch cobblemon:main into main 2023-10-17 21:49:58 +00:00
Xander Forrest 295c73ae69 Don't create chunk in SpawningProspector 2023-10-17 22:47:38 +01:00
Xander Forrest 899bdb38ac Removes ServerChunkManagerMixin.java 
Update chunk logic in AreaSpawner.constrainArea to reflect this
Updated Prospector to not use SCCM when getting chunks
 2023-10-17 21:40:47 +01:00
Nick f30e5bda1e Merge branch 'improve-mongo-db-store-override' into 'main' 
Improve the ability to reuse and override the MongoDBStoreAdapter.

See merge request cable-mc/cobblemon!694
 2023-10-17 19:50:18 +00:00
Licious 76c870b472 Fix Fabric big root spreading. 2023-10-17 20:40:43 +01:00
Nick 963448e173 Merge branch 'composter-registration-changes' into 'main' 
Update Composter block valid item registration

See merge request cable-mc/cobblemon!693
 2023-10-17 19:30:03 +00:00
Licious 48d2fc6e2e Improve the ability to reuse and override the MongoDBStoreAdapter. 2023-10-17 20:08:49 +01:00
Licious 5868d39431 Rework Composter item registration to be platform implementation specific. 2023-10-17 19:53:48 +01:00
Xander Forrest c47b3a21db Move isBoxLoaded to WorldExtensions.kt 2023-10-17 10:41:47 +01:00
Xander Forrest 0d12fb1f1c When running AreaSpawner, check area box's chunks are all loaded before attempting to get all entities in the area 2023-10-17 10:18:05 +01:00
Hiroku 78c7188a11 Merge branch 'update_version' into 'main' 
update version

See merge request cable-mc/cobblemon!691
 2023-10-16 03:49:53 +00:00
Hiroku ff5f63a998 Merge branch 'main' into 'update_version' 
# Conflicts:
#   gradle.properties
 2023-10-16 03:49:34 +00:00
Lily b9a8a9be11 update version 2023-10-15 22:24:29 -04:00
Paul 2046482252 Turn snapshot back on, 1.4 looks good 2023-10-14 17:46:43 +10:00
Hiroku 6a737999a9 Merge branch 'sendingOutShoulderedCobblemon' into 'main' 
Dismounting Shouldered Cobblemon

Closes #473

See merge request cable-mc/cobblemon!680
 2023-10-14 07:04:34 +00:00
Waldleufer 89d37e583b Dismounting Shouldered Cobblemon 2023-10-14 07:04:33 +00:00