Apion
|
a18b54849f
|
Merge branch 'FetusAnimsUpdate' into 'main'
Many updates, asset changes, and refactors for the fossil machine
See merge request cable-mc/cobblemon!863
|
2024-02-10 01:24:04 +00:00 |
|
Hiroku
|
3b65d1967e
|
Merge branch 'main' into 'whatsy/evo_stone_blocks'
# Conflicts:
# CHANGELOG.md
|
2024-02-10 00:16:06 +00:00 |
|
Paul
|
ea9287cfb5
|
Fixed langs on interaction GUIs
|
2024-02-10 09:55:31 +10:00 |
|
Paul
|
3bb3a00cef
|
Renamed InteractionGUICreationEvent to PokemonInteractionGUICreationEvent
|
2024-02-10 08:28:31 +10:00 |
|
Paul
|
f1ae4163c9
|
Cleaned up transition portion of PokemonRender#render and removed glow effect we don't want anymore
|
2024-02-10 08:27:31 +10:00 |
|
Paul
|
05957f2106
|
Renamed GenericBedrockModelRepository to GenericBedrockEntityModelRepository for clarity
|
2024-02-10 08:03:50 +10:00 |
|
Paul
|
4b9ea1d4cd
|
Use an entity renderer for GenericBedrockEntities, obviously
|
2024-02-10 08:03:12 +10:00 |
|
Paul
|
e5c4240ae0
|
Merge remote-tracking branch 'origin/main' into amo/sendout-upgrade
# Conflicts:
# CHANGELOG.md
# forge/src/main/kotlin/com/cobblemon/mod/forge/client/CobblemonForgeClient.kt
|
2024-02-09 20:22:27 +10:00 |
|
Paul
|
317112f9bb
|
Cleanup
|
2024-02-09 19:38:32 +10:00 |
|
Paul
|
3b442d387a
|
licenses good, pipeline errors bad
|
2024-02-09 16:04:53 +10:00 |
|
Paul
|
2b575c888f
|
Disable evo effect since it's not done yet
|
2024-02-09 14:15:58 +10:00 |
|
Paul
|
6e5e572412
|
Fixed some ball effects occurring even when snap-recalling before send out completes
|
2024-02-09 14:14:55 +10:00 |
|
Lily
|
ce87d0dc48
|
Merge branch 'main' into whatsy/nether_fire_stone
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/item/group/CobblemonItemGroups.kt
|
2024-02-08 23:10:14 -05:00 |
|
Lily
|
d43c91129c
|
implemented nether fire stone ore
|
2024-02-08 23:02:26 -05:00 |
|
JazzMcNade
|
dc37b381a0
|
Review Changes: Refactored part of setStack into its own function
|
2024-02-07 21:17:56 -06:00 |
|
JazzMcNade
|
95bcb9a7b8
|
Most of the requested review changes
|
2024-02-06 23:28:15 -06:00 |
|
Lily
|
f1439ec724
|
internal changes to tumblestones
|
2024-02-05 19:18:53 -05:00 |
|
Lily
|
8529bb119f
|
added a missing sherd + added sherds to the vanilla ingredients tab
|
2024-02-05 17:24:44 -05:00 |
|
JazzMcNade
|
b68b3ad55e
|
Fossil Machine now stores return items of natural materials fed via hopper. Return items can be retrieved via hopper or by breaking the machine. Restoration Tank block can now be place on hoppers.
|
2024-02-04 18:35:23 -06:00 |
|
Hiroku
|
70c6b74f0f
|
Merge branch 'pottery-sherds' into 'main'
Implemented pottery sherds
See merge request cable-mc/cobblemon!861
|
2024-02-04 05:00:54 +00:00 |
|
Apion
|
0c26cb026c
|
Remove extra braces
|
2024-02-04 03:57:40 +00:00 |
|
Hiroku
|
6078e22b14
|
Merge branch 'ball-entity-names' into 'main'
Empty Poké Ball Entity Name
Closes #755
See merge request cable-mc/cobblemon!852
|
2024-02-04 03:52:05 +00:00 |
|
Apion
|
cb1226013d
|
Removed unneeded access widener
|
2024-02-04 03:47:39 +00:00 |
|
apion
|
0c8318d317
|
Licenses :P
|
2024-02-03 22:46:04 -05:00 |
|
apion
|
8d80bcfd6b
|
Fixed remaining patterns
|
2024-02-03 22:45:26 -05:00 |
|
apion
|
cfd4fa1785
|
Fix dome, helix, and sus patterns
|
2024-02-03 22:35:56 -05:00 |
|
apion
|
86bd70177c
|
Sherds work :O
|
2024-02-03 22:28:57 -05:00 |
|
Licious
|
943d6e0c55
|
Dynamic lighting compat
|
2024-02-03 21:49:27 +00:00 |
|
apion
|
7d82a2f7c8
|
Start working on injecting sherd textures, bunch of immutable maps need to not be immutable
|
2024-02-02 20:53:04 -05:00 |
|
Lily
|
782ba524df
|
fossil block break speed + loot table
|
2024-02-02 20:24:07 -05:00 |
|
apion
|
c571d79035
|
Added sherd tag
|
2024-02-02 19:48:31 -05:00 |
|
Kyozenno
|
d2fce5edb5
|
Inkay: Add 2nd easter egg nickname evo
|
2024-02-02 22:20:48 +00:00 |
|
jeffw773
|
cba32b7443
|
- Adding Tweaked textures for fossil embryo goopies that are a tad darker in case they are liked better
|
2024-02-02 13:32:56 -08:00 |
|
JazzMcNade
|
4a81c24a3d
|
Hopefully less mobs will get hung up on the Monitor Block
|
2024-02-02 01:03:41 -06:00 |
|
Lily
|
776e629850
|
updated CobblemonItemTags and fixed hand animation not playing on pure client instances
|
2024-02-01 21:38:20 -05:00 |
|
Paul
|
9afb8b04c2
|
Fixed edge case in FPS particles
|
2024-02-02 11:54:12 +10:00 |
|
Nick
|
90c74eddc8
|
Merge branch 'does_this_qualify_as_grafting' into 'main'
Implement #748 Allow players to plant apricorn sprouts on leaves
Closes #748
See merge request cable-mc/cobblemon!854
|
2024-01-30 17:53:47 +00:00 |
|
Nick
|
3600178d3b
|
Merge branch 'lefties-not-the-store-pls-no-copyright' into 'main'
Adds leaves_leftovers item tag.
See merge request cable-mc/cobblemon!858
|
2024-01-30 17:52:26 +00:00 |
|
Apion
|
66d8a01917
|
Merge branch 'hold-my-event' into 'main'
Implement HeldItemEvent. Remove unnecessary setter method for already public var.
See merge request cable-mc/cobblemon!857
|
2024-01-29 23:55:57 +00:00 |
|
Licious
|
68e32b21b5
|
Adds leaves_leftovers item tag.
|
2024-01-29 23:21:47 +00:00 |
|
Licious
|
670882bb4d
|
Implement HeldItemEvent. Remove unnecessary setter method for already public var.
|
2024-01-29 23:13:27 +00:00 |
|
dhi_holo
|
9c0708651f
|
Cobble Particles
Azure, Slate, Citrine, Verdant, Roseate
|
2024-01-29 17:09:34 +10:00 |
|
JazzMcNade
|
1b3bb3b5bc
|
Ownership message can now identify players who are currently not connected to the server.
|
2024-01-29 01:08:57 -06:00 |
|
dhi_holo
|
cd03ef68c3
|
Gen 3 4-7, Gen 4 1-2
Dive, Nest, Repeat, Timer, Heal, Quick
|
2024-01-29 17:03:20 +10:00 |
|
dhi_holo
|
69716b5050
|
Gen 2 7-9 and Gen 3 1-3
Friend, Love, Moon, Luxury, Premier, Net
|
2024-01-29 16:28:40 +10:00 |
|
dhi_holo
|
015deb4eeb
|
Gen 2 1-6
Particles for Park, Sport, Fast, Level, Lure, Heavy Balls
|
2024-01-29 15:07:53 +10:00 |
|
dhi_holo
|
96023077ad
|
Gen 1 Full
Should fix all of the remaining issues with the Gen 1 particles
|
2024-01-29 13:09:31 +10:00 |
|
JazzMcNade
|
d96c68b5b4
|
All monitor blockstates now use the off state's particle texture.
|
2024-01-28 21:05:22 -06:00 |
|
JazzMcNade
|
dc27867502
|
Dry stuff for markedRemoved (related to stopping sounds). Loop sound stops when the monitor block is destroyed.
|
2024-01-28 20:58:29 -06:00 |
|
JazzMcNade
|
bfbea377c1
|
Monitor now switches to the OFF state if the fossil pokemon is retrieved while machine was in the protected state
|
2024-01-28 19:55:30 -06:00 |
|