Skip to content

Moe like Yes at this point with what was added. Statues are in there though. #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JT122406 merged 117 commits into from
Sep 11, 2023
Merged

Moe like Yes at this point with what was added. Statues are in there though. #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
117 commits
Select commit Hold shift + click to select a range
8f42d3d
Add model code for later usage.
Waterpicker Jun 17, 2023
aa63430
Currently ported code for models.
Waterpicker Jun 19, 2023
3f76055
Pokemon render now. Bleh.
Waterpicker Jun 20, 2023
f401ad8
Setup base for armor sets
JT122406 Jun 21, 2023
29aadb0
Merge branch 'master' into armor
JT122406 Jun 24, 2023
e2befd6
More Done
JT122406 Jun 24, 2023
aba1cbe
Push maven details
Waterpicker Jun 17, 2023
c7d8e41
><
Waterpicker Jun 17, 2023
bdd7b75
Start of reimplmenting pokemon legendary mechanics.
Waterpicker Jun 18, 2023
87334fa
Regigigas and Bird spawning. :D
Waterpicker Jun 19, 2023
f09c1dd
dialogue!
Waterpicker Jun 19, 2023
54dff6d
Ported a bit more dialog
Waterpicker Jun 20, 2023
2fe38d0
Rewrote networking to be similar to cobblemon's to abuse cobblemon's …
Waterpicker Jun 23, 2023
a3321ac
Taking longer than expected and dialogs not done yet. But networking …
Waterpicker Jun 24, 2023
f165b8b
Merge branch 'master' into armor
JT122406 Jun 26, 2023
dda91ea
Healers and pcs completed by using cobblemon machines as a base. PCs …
Waterpicker Jun 26, 2023
d71ce96
Merge remote-tracking branch 'origin/master' into cobblemon-integrati…
Waterpicker Jun 26, 2023
a0a8bde
All Armor declared, Use loop in Item Datagen
JT122406 Jun 26, 2023
d27f3b5
add ArmorMaterial to Armor set record
JT122406 Jun 26, 2023
d076c2a
Merge remote-tracking branch 'origin/armor' into cobblemon-integratio…
Waterpicker Jun 26, 2023
bf16952
Finished datagen stuff for JT and got armor working on forge.
Waterpicker Jun 26, 2023
c1f4a60
Poke loot
Waterpicker Jun 27, 2023
920934b
Merge remote-tracking branch 'origin/master' into cobblemon-integrati…
Waterpicker Jun 27, 2023
11a9fc7
Merge branch 'armor' into cobblemon-integration-main
Waterpicker Jun 27, 2023
23366d3
Correct all the things networking and forge integration related.
Waterpicker Jun 27, 2023
fa0c3d0
Merge remote-tracking branch 'origin/master' into cobblemon-integrati…
Waterpicker Jun 28, 2023
3510033
set kotlin toolchain to 17
JT122406 Jun 28, 2023
5775799
Updated for merged PR.
Waterpicker Jun 28, 2023
42c1e5c
Merge branch 'cobblemon-models' into cobblemon-integration-main
Waterpicker Jun 28, 2023
fa76ac9
:D IT works!
Waterpicker Jun 28, 2023
52ae26b
Clean up add opt depo to forge
JT122406 Jun 28, 2023
3c5572a
Push JT's requested changes
Waterpicker Jun 28, 2023
09efe77
change to 17 for github actions
JT122406 Jun 28, 2023
2878ccd
Music Discs!
Waterpicker Jun 29, 2023
02bca65
Merge remote-tracking branch 'origin/cobblemon-integration-main' into…
Waterpicker Jun 29, 2023
e595800
Fixed breeder crash
Waterpicker Jun 29, 2023
f43b5e0
Fixed Breeder Block
Waterpicker Jun 29, 2023
f034a12
Records pt 1
Waterpicker Jun 29, 2023
406a5f1
Records pt 2
Waterpicker Jun 29, 2023
9c900f0
Finish Records and did some error clean up.
Waterpicker Jun 29, 2023
89f0343
Merge branch 'master' into cobblemon-integration-main
JT122406 Jun 29, 2023
263c933
adjust mods.toml
JT122406 Jun 29, 2023
eaafb19
MERGE!
JT122406 Jun 29, 2023
cf3920a
TMs!
Waterpicker Jun 30, 2023
3f192ed
Edited TMs and attempted fixed models.
Waterpicker Jul 1, 2023
f4e9b9d
Additional model edits.
Waterpicker Jul 1, 2023
80ab37a
Merge remote-tracking branch 'origin/master' into cobblemon-integrati…
Waterpicker Jul 1, 2023
212e1ac
Fix a variant issue.
Waterpicker Jul 5, 2023
d7244d5
Merge branch 'master' into cobblemon-integration-main
Waterpicker Jul 5, 2023
bd73509
First batch of models.
Waterpicker Jul 7, 2023
15069f3
Applin
Waterpicker Jul 8, 2023
4a6d5b0
A Done. >< besides alcremie
Waterpicker Jul 8, 2023
f97a1b6
I am praying
JT122406 Jul 11, 2023
27c95b3
How much updates? Yes
Waterpicker Jul 11, 2023
fbdf516
Fixed bugs with models and then did articuno.
Waterpicker Jul 11, 2023
3488ea9
Datagen pokemon resolvers/posers
Waterpicker Jul 12, 2023
335de3b
Merge remote-tracking branch 'origin/master' into cobblemon-integrati…
Waterpicker Jul 14, 2023
7547c21
Merge remote-tracking branch 'origin/master' into cobblemon-integrati…
Waterpicker Jul 18, 2023
10f04ca
Held Item support. (Needs testing.)
Waterpicker Jul 18, 2023
c3622b7
Got it to run and added wooloo. (Someone needs to do shaven still)
Waterpicker Jul 18, 2023
4204f14
Most A pokemon added.
Waterpicker Jul 19, 2023
49b0b50
Did most of C, D, X and Y.
Waterpicker Jul 19, 2023
09d0ef7
Missing D and added E and F
Waterpicker Jul 21, 2023
8595c5e
G
Waterpicker Jul 21, 2023
b7208f6
Merge remote-tracking branch 'origin/master' into cobblemon-integrati…
Waterpicker Jul 25, 2023
e4c3d45
Attempt at new models.
Waterpicker Jul 25, 2023
1f65d2e
Lets see if this fixes actions on this branch
JT122406 Jul 26, 2023
69bb4be
Merge branch 'master' into cobblemon-integration-main
JT122406 Aug 1, 2023
21222c7
Merge branch 'master' into cobblemon-integration-main
JT122406 Aug 15, 2023
51d7afa
Fix some merge issues
JT122406 Aug 15, 2023
0f3ed79
Fix Checks
JT122406 Aug 16, 2023
506336b
Merge remote-tracking branch 'orgin/cobblemon-integration-main' into …
Waterpicker Aug 16, 2023
96f701e
disc
Waterpicker Aug 16, 2023
b230d87
Purge unused model json that aren't viable until mass model conversio…
Waterpicker Aug 16, 2023
52d96f9
Push current conversion.
Waterpicker Aug 16, 2023
43490d7
Another one.
Waterpicker Aug 16, 2023
cd319c7
Kotlin conversion provisionally complete?
Waterpicker Aug 17, 2023
65a4c0a
Merge remote-tracking branch 'origin/master' into cobblemon-integrati…
JT122406 Aug 17, 2023
c008f95
3.0-Alpha-SNAPSHOT Cycle
JT122406 Aug 17, 2023
be3e51c
Statues gonna statue.
Waterpicker Aug 21, 2023
db74a95
yes more statues
Waterpicker Aug 21, 2023
f22afc9
Disabled stencil to see what is going on and added a dedicated RareCa…
Waterpicker Aug 22, 2023
d63cc24
Did a bit of tinkering. ><
Waterpicker Aug 22, 2023
76b1cfa
add debug stuff for water. Pokemon way too close. move it on Z axis t…
hYdos Aug 23, 2023
65582d2
Gui Rendering complete barring new hook for needed into.
Waterpicker Aug 28, 2023
83ba87e
Merge remote-tracking branch 'origin/gui' into gui
Waterpicker Aug 28, 2023
38b6200
preemptive setting up for new model hooks in cobblemon. Do not merge …
Waterpicker Aug 28, 2023
9588c42
Current thingy.
Waterpicker Aug 29, 2023
b9317e6
materials
Waterpicker Aug 29, 2023
994735e
Merge branch 'gui' into statues
Waterpicker Aug 31, 2023
5ef08ae
Merge branch 'master' into statues
Waterpicker Sep 6, 2023
57d9dfe
Yes
Waterpicker Sep 6, 2023
e6eff7b
Push current work with statues.
Waterpicker Sep 6, 2023
38307c6
Merge remote-tracking branch 'origin/master' into statues
Waterpicker Sep 8, 2023
fc826cf
pokeloot fixes
Dysth Sep 8, 2023
0fa2eaa
pokemon json progress (trying regex)
Dysth Sep 8, 2023
eba3f01
implemented true
Dysth Sep 8, 2023
b5ea697
pokedoll drops
Dysth Sep 8, 2023
35406d1
missing regional forms
Dysth Sep 8, 2023
83da483
more pokeloot fixes
Dysth Sep 8, 2023
dff0a2b
Model loading debug.
Waterpicker Sep 8, 2023
8e6b5f4
Disable renderdoc
Waterpicker Sep 8, 2023
2a168b6
TMs. :3
Waterpicker Sep 8, 2023
0163417
pokeloot tms
Dysth Sep 8, 2023
cff1215
last fix, just need missing items
Dysth Sep 8, 2023
577ce3a
More stuff!
Waterpicker Sep 9, 2023
7f82800
fixes, datapack now loads
Dysth Sep 9, 2023
66f5e61
Disable renderdoc (fabric this time)
Dysth Sep 9, 2023
75e52c6
Attempt at network fix meshed with statue stuff.
Waterpicker Sep 10, 2023
a868713
Fix a thing
Waterpicker Sep 10, 2023
22ae764
Revert "Fix a thing"
Dysth Sep 10, 2023
9d60d85
Walleyes at all networking tape.
Waterpicker Sep 10, 2023
f4e56b5
Merge remote-tracking branch 'origin/statues' into statues
Waterpicker Sep 10, 2023
193a72b
asset progress for water
Dysth Sep 10, 2023
8cbbf13
Push current purge so I don't forget.
Waterpicker Sep 11, 2023
5a11048
rename pokemon_editor to pokemon_wand, hide celestial altar and add r…
Waterpicker Sep 11, 2023
12e38f2
Final stuff for purge.
Waterpicker Sep 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 0 additions & 7 deletions common/src/main/generated/resources/assets/generations_core/blockstates/box.json
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions common/src/main/generated/resources/assets/generations_core/blockstates/clock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "generations_core:block/clock"
}
}
}
7 changes: 7 additions & 0 deletions common/src/main/generated/resources/assets/generations_core/blockstates/healer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "generations_core:block/healer"
}
}
}
7 changes: 0 additions & 7 deletions common/src/main/generated/resources/assets/generations_core/blockstates/inside_wall.json
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions .../src/main/generated/resources/assets/generations_core/blockstates/inside_wall_bottom.json
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions .../src/main/generated/resources/assets/generations_core/blockstates/inside_wall_middle.json
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions ...src/main/generated/resources/assets/generations_core/blockstates/inside_wall_molding.json
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions common/src/main/generated/resources/assets/generations_core/blockstates/inside_wall_top.json
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions common/src/main/generated/resources/assets/generations_core/blockstates/outside_wall.json
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions common/src/main/generated/resources/assets/generations_core/blockstates/pastel_bean_bag.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "generations_core:block/pastel_bean_bag"
}
}
}
7 changes: 7 additions & 0 deletions common/src/main/generated/resources/assets/generations_core/blockstates/pc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "generations_core:block/pc"
}
}
}
7 changes: 0 additions & 7 deletions common/src/main/generated/resources/assets/generations_core/blockstates/poke_dirt.json
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions common/src/main/generated/resources/assets/generations_core/blockstates/poke_grass.json
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions common/src/main/generated/resources/assets/generations_core/blockstates/poke_sand.json
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions .../src/main/generated/resources/assets/generations_core/blockstates/poke_sand_corner_1.json
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions .../src/main/generated/resources/assets/generations_core/blockstates/poke_sand_corner_2.json
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions .../src/main/generated/resources/assets/generations_core/blockstates/poke_sand_corner_3.json
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions .../src/main/generated/resources/assets/generations_core/blockstates/poke_sand_corner_4.json
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions ...on/src/main/generated/resources/assets/generations_core/blockstates/poke_sand_side_1.json
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions ...on/src/main/generated/resources/assets/generations_core/blockstates/poke_sand_side_2.json
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions ...on/src/main/generated/resources/assets/generations_core/blockstates/poke_sand_side_3.json
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions ...on/src/main/generated/resources/assets/generations_core/blockstates/poke_sand_side_4.json
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions ...ain/generated/resources/assets/generations_core/blockstates/poke_sand_small_corner_1.json
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions ...ain/generated/resources/assets/generations_core/blockstates/poke_sand_small_corner_2.json
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions common/src/main/generated/resources/assets/generations_core/blockstates/sandy_grass.json
View file
Open in desktop

This file was deleted.

Loading