Skip to content

Commit 787cc90

Browse files
asojiasoji
committed
⬆️ Updated Inner Pastels
1 parent 8c05514 commit 787cc90

13 files changed

Lines changed: 34 additions & 31 deletions

‎.github/ISSUE_TEMPLATE/bugs.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ body:
5050
options:
5151
- "v0.5.0"
5252
- "v0.6.0"
53+
- "v0.7.0"
5354
validations:
5455
required: true
5556

@@ -59,6 +60,7 @@ body:
5960
description: What Inner Pastels version was attached? [look in your log for `[SofterPastels] Internal Library Version`]
6061
options:
6162
- "1.0.0+build.10"
63+
- "1.0.4+build.37+branch.kt.1.20.5.main"
6264
validations:
6365
required: false
6466

@@ -68,6 +70,7 @@ body:
6870
description: What Minecraft version did this happen in?
6971
options:
7072
- "1.20.4"
73+
- "1.20.5"
7174
validations:
7275
required: true
7376

‎build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.archivesName
22

33
plugins {
4-
kotlin("jvm") version "1.9.20-RC"
4+
kotlin("jvm") version "1.9.23"
55
`maven-publish`
66
java
77

@@ -46,7 +46,7 @@ dependencies {
4646
modImplementation(libs.bundles.dependencies)
4747
modLocalRuntime(libs.bundles.dev.mods)
4848

49-
include(modImplementation("gay.asoji:innerpastels:1.0.4+build.37+branch.kt.1.20.5.main")!!)
49+
include(modImplementation("gay.asoji:innerpastels:1.1.0+rev.a588fcb+branch.kt.1.20.5.main")!!)
5050
include(modImplementation("gay.asoji:fmw:1.0.0+build.8")!!)
5151
}
5252

‎src/main/generated/.cache/161a209d2b3281f36171a048572be3ce2c013faa‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.5 2024-04-24T03:46:17.7657695 Softer Pastels/Block Loot Tables
1+
// 1.20.5 2024-04-26T00:38:59.0449403 Softer Pastels/Block Loot Tables
22
a32510c4c887d073d9487d4efdbeddd2e405b5b9 data\softerpastels\loot_tables\blocks\red_glass.json
33
e7f9c5d90904aa0156864fee54326d1592ca4cb4 data\softerpastels\loot_tables\blocks\light_green_wool.json
44
aab53464e4891ebc18b773a85c62b83baeebdb70 data\softerpastels\loot_tables\blocks\orange_pastel_powder_block.json
@@ -153,8 +153,8 @@ f6b2521cb13a5ffecc7d7825d4b12a41daa01ac3 data\softerpastels\loot_tables\blocks\g
153153
dec4ed7cd5e55871773146b58d5a126a19ae201b data\softerpastels\loot_tables\blocks\blue_wool.json
154154
be36013f77af49567dd47fd35a8b74e79ce5451a data\softerpastels\loot_tables\blocks\red_wall.json
155155
54fd44eef015fdfd3c0d395bc4e85516262a7291 data\softerpastels\loot_tables\blocks\magenta_glass_pane.json
156-
abb8193f247d1d00c9a32dd0cc2c0609c595ab67 data\softerpastels\loot_tables\blocks\brown_pastel_block.json
157156
8c3bd3d832c34cb9385649a0d454554d20c37822 data\softerpastels\loot_tables\blocks\brown_fence.json
157+
abb8193f247d1d00c9a32dd0cc2c0609c595ab67 data\softerpastels\loot_tables\blocks\brown_pastel_block.json
158158
40473e4089c32745b1de45708480c80222640557 data\softerpastels\loot_tables\blocks\orange_glass_pane.json
159159
3644070c452379f51f346ddf215a4c5e7b5088c0 data\softerpastels\loot_tables\blocks\green_glass_pane.json
160160
bfbc83cfacb50df79efb6c54f9f2bfbbb24f937d data\softerpastels\loot_tables\blocks\blue_pastel_block.json
@@ -170,8 +170,8 @@ ac5fe76e538d129da88bc72434ed759cfce6d84e data\softerpastels\loot_tables\blocks\p
170170
118cc1a3784479ce93e68e3aee4b4cebf3548a21 data\softerpastels\loot_tables\blocks\light_red_glass.json
171171
ad58b31813cf87e6141c7575b985268050db783c data\softerpastels\loot_tables\blocks\yellow_wool.json
172172
b77d17d3fc3c7eb375cc902295422d1f72e00818 data\softerpastels\loot_tables\blocks\green_pastel_powder_block.json
173-
b4bab7b6230904c4698b0d6642b660a20d6fd0e4 data\softerpastels\loot_tables\blocks\light_green_stairs.json
174173
c5126d807b64e051b1340094aed931a31c623206 data\softerpastels\loot_tables\blocks\gray_glass_pane.json
174+
b4bab7b6230904c4698b0d6642b660a20d6fd0e4 data\softerpastels\loot_tables\blocks\light_green_stairs.json
175175
9638de39249b9140d8a307a8f8fe73ffa3dc4730 data\softerpastels\loot_tables\blocks\light_blue_wool.json
176176
03c9b8c6854ae469473776d0d31fabe30e0d7e8c data\softerpastels\loot_tables\blocks\purple_wool.json
177177
1afa9bf4ded5552c5219d39a7d5ff55b856ce848 data\softerpastels\loot_tables\blocks\gray_fence_gate.json

‎src/main/generated/.cache/340bab1cfebf6a6449f15726c28bee681561238b‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.5 2024-04-24T03:46:17.7682831 Softer Pastels/Tags for minecraft:item
1+
// 1.20.5 2024-04-26T00:38:59.0479478 Softer Pastels/Tags for minecraft:item
22
503c82234d3717657501dfac6d020b35d1203dd3 data\innerpastels\tags\items\slabs.json
33
7b0e96577c8d01ebb95569f238f16015aa018602 data\innerpastels\tags\items\ice_cream.json
44
bb17f3b53b971aa3e6768e8b62dccc460c31d237 data\minecraft\tags\items\wool_carpets.json
@@ -22,8 +22,8 @@ eec67b90ad0993bed0cf7ea415c35b34d54e5078 data\innerpastels\tags\items\taffies.js
2222
87854eed7c17595d5fbbb9cbad9a2d5cabccfc9c data\minecraft\tags\items\fences.json
2323
c7705cf94596459a297a85e5fad3749dfba2b9b9 data\innerpastels\tags\items\pastel_blocks.json
2424
48e5187534e3addd25a90c319b3204cde2b76228 data\innerpastels\tags\items\cotton_candies.json
25-
1311aba0a0aff39a80ce56d5fba02d795674cdbd data\minecraft\tags\items\fence_gates.json
2625
656cec2d3bdf88e77c25bcc59da627e6e8f93df1 data\innerpastels\tags\items\stairs.json
26+
1311aba0a0aff39a80ce56d5fba02d795674cdbd data\minecraft\tags\items\fence_gates.json
2727
6fa7ea6886fbb87e7c424de0ddcc59479a1f6899 data\innerpastels\tags\items\carpets.json
2828
dcc47476ad2c1ea0f8f21f2d08771d0eecd221dc data\innerpastels\tags\items\wools.json
2929
e055496eab28d6f2c330a20667cec912ec9d611f data\c\tags\items\glass_blocks.json

‎src/main/generated/.cache/434de9894787036333a194f4817a4f534dba9bde‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.5 2024-04-24T03:46:17.7682831 Softer Pastels/Model Definitions
1+
// 1.20.5 2024-04-26T00:38:59.0494619 Softer Pastels/Model Definitions
22
991ae8e5a898196110c2a1de114abbdcab3d37fe assets\softerpastels\models\item\green_pastel_powder_block.json
33
2b06b5342e5949efe5ef4ae1ef1805a622526345 assets\softerpastels\models\block\black_stairs.json
44
6c98b53911f4469f8ca81e9d29e3cf7d9c4482e7 assets\softerpastels\blockstates\light_red_glass.json
@@ -56,8 +56,8 @@ f8a081a8cd8067611dffc6c7dc5489543000fa39 assets\softerpastels\models\block\yello
5656
3c792bc1e4a211b493b1388e4cdb8a5c4020be91 assets\softerpastels\models\item\green_glass.json
5757
2dc83ad9233126302a5bfe72136113f184036e8b assets\softerpastels\models\block\white_stairs_outer.json
5858
c99361c1254f03d14b620d40673889e5964d5729 assets\softerpastels\models\block\light_green_slab.json
59-
e6e0c1251b8eebe0407afe9efc341bff3ca76c83 assets\softerpastels\blockstates\black_pastel_powder_block.json
6059
12401f5be45b0423215236b03ff5ff04aee60dca assets\softerpastels\blockstates\orange_light.json
60+
e6e0c1251b8eebe0407afe9efc341bff3ca76c83 assets\softerpastels\blockstates\black_pastel_powder_block.json
6161
802c6518df9a140b1c444f1002dd235bb0be021c assets\softerpastels\models\block\blue_wall_side.json
6262
4ce85aa5b2e7319a4354ff6205b272e5d424e974 assets\softerpastels\models\block\light_gray_slab_top.json
6363
fc816f2804b609009eaa1b57bbb6626f31b6318b assets\softerpastels\blockstates\light_red_carpet.json
@@ -154,8 +154,8 @@ ab1225d2d6359d473ae9f755637e7031bbf766af assets\softerpastels\models\item\gray_s
154154
a7ffbc5af8ecaa9c46f977560714a47fd6c0245d assets\softerpastels\models\block\blue_slab_top.json
155155
28996a185e445f033c9b61496865f69c3322f9e5 assets\softerpastels\models\item\red_wool.json
156156
25efa978453092f64a13f4c778aa262f97d456ba assets\softerpastels\models\item\light_red_hard_candy.json
157-
098df39c26263941ac2be90bb454d8ca0bc4091f assets\softerpastels\blockstates\yellow_wall.json
158157
51e732a7109a13a5b5bd7ec1ea26488a9fc8831c assets\softerpastels\blockstates\red_slab.json
158+
098df39c26263941ac2be90bb454d8ca0bc4091f assets\softerpastels\blockstates\yellow_wall.json
159159
43feb41e5293677a03c2d8db5c3b85831bc372c3 assets\softerpastels\models\item\light_red_glass_pane.json
160160
2e97fc01ddac5be0e4f407cb10a8d163895fb5ca assets\softerpastels\models\block\gray_stairs_inner.json
161161
13aa01df7a363f375d13f2f25a4fa62ceb7db3fb assets\softerpastels\models\block\green_glass_pane_side_alt.json
@@ -197,8 +197,8 @@ f2257092e204cd1dd8d72f221c1cd34fdfb515b7 assets\softerpastels\models\block\blue_
197197
d3840adb70bd5036d737229c942a5b99aa11788b assets\softerpastels\models\item\light_gray_glass_pane.json
198198
54a5b24c5f5faf87ed7d31b47602bbfe2913b7e8 assets\softerpastels\models\item\yellow_cotton_candy.json
199199
2ed8a579ec4877d183763b43a46ca201e6fbb2b6 assets\softerpastels\blockstates\orange_wool.json
200-
07acf7f2d328331261db1f2faaf34e1f3a38e614 assets\softerpastels\blockstates\gray_wool.json
201200
226c13f25228855d51fed32d21f39984c9dc1dc1 assets\softerpastels\models\block\yellow_pastel_block.json
201+
07acf7f2d328331261db1f2faaf34e1f3a38e614 assets\softerpastels\blockstates\gray_wool.json
202202
61e623400006187b9e436e497363b213bf4e5d96 assets\softerpastels\models\block\purple_slab_top.json
203203
36c9a68e80e2fd3b49b9189348ced5a4c23768db assets\softerpastels\models\item\orange_slab.json
204204
d304871fcebf37e3a12779b33bc7bb1ed30881c6 assets\softerpastels\blockstates\light_red_glass_pane.json
@@ -463,8 +463,8 @@ e253ed15cf6e54cbaf68628c055ed8a84076a992 assets\softerpastels\models\item\white_
463463
857789c683e8897ba5e026cdd73256ea03bbb9c8 assets\softerpastels\models\item\light_blue_wall.json
464464
3cfd51691157a04a1c52e521a7841bb5ac2436de assets\softerpastels\blockstates\light_blue_glass.json
465465
84f62b3b3152a9836ceacc6ae8a174aef8a5013a assets\softerpastels\blockstates\light_gray_wall.json
466-
69b851de9f51b8f8925972ce2d6850fcced46ba6 assets\softerpastels\blockstates\green_glass_pane.json
467466
e43a80987a258eb33b97653dd684bc2f37ad6a14 assets\softerpastels\blockstates\light_blue_fence_gate.json
467+
69b851de9f51b8f8925972ce2d6850fcced46ba6 assets\softerpastels\blockstates\green_glass_pane.json
468468
430877cf740692f04454c0a9ef4b4eeea8e6f770 assets\softerpastels\blockstates\blue_pastel_powder_block.json
469469
1a374f610df8acb7fe58452e775e3e77a1e47228 assets\softerpastels\models\block\purple_stairs.json
470470
d897bf14e31e99c2bd4816f874538671d4d64719 assets\softerpastels\blockstates\blue_light.json
@@ -494,8 +494,8 @@ c0ef49c5cdc5463ef0663ef5346aad30ecbfb852 assets\softerpastels\blockstates\blue_f
494494
de4f5bacc3d228e9a7ef2baadf4c73e67b2761f0 assets\softerpastels\models\item\white_hard_candy.json
495495
50301ea179d7dfbd6d5de0bdfd03c6ef849e70c0 assets\softerpastels\models\item\purple_cotton_candy.json
496496
f6f29b66f5c8722a50e87e513efba3a09f3f1f42 assets\softerpastels\blockstates\yellow_fence.json
497-
2aeabd31122677cea00b3be7526c17d30dda37b0 assets\softerpastels\blockstates\purple_glass_pane.json
498497
c8195aa8fb4e32b3afd0d92df58790601fad28bf assets\softerpastels\models\item\red_pastel_powder_block.json
498+
2aeabd31122677cea00b3be7526c17d30dda37b0 assets\softerpastels\blockstates\purple_glass_pane.json
499499
1ca5bd2d6fddd5aca4dd1fae4363b7c977af71ba assets\softerpastels\models\item\white_stairs.json
500500
9ef6c3ccaf106ce9ef150101c53065bf02f7fa81 assets\softerpastels\blockstates\blue_glass_pane.json
501501
c97053d2a0ff25ad6e7c2b4234835a8c76ad8e1b assets\softerpastels\models\block\brown_fence_gate_open.json
@@ -627,16 +627,16 @@ ae2225c93c31e428b023fb6facc512ce9fd27228 assets\softerpastels\blockstates\light_
627627
63560d8621b9dca3a53ea5c2bc41ec083b377bdd assets\softerpastels\models\block\white_wool.json
628628
a69c83f14a2a7f0f00c44545b88e4fdbf679657c assets\softerpastels\blockstates\light_gray_stairs.json
629629
d3798de929319003aa49b9974c814c2cf7579ded assets\softerpastels\models\item\green_hard_candy.json
630-
09384cbe5743441130019005999fa06643431847 assets\softerpastels\blockstates\green_fence_gate.json
631630
ba89c0cec440697637dfdf5616f82a816fc40ebd assets\softerpastels\blockstates\light_green_stairs.json
631+
09384cbe5743441130019005999fa06643431847 assets\softerpastels\blockstates\green_fence_gate.json
632632
1746f5358645af1d0b787e1e54673a17ae1c1693 assets\softerpastels\models\block\light_gray_wall_side_tall.json
633633
cfeca269b59322a06b00ec790976c97c2de9525a assets\softerpastels\blockstates\yellow_stairs.json
634634
fd7fc243d6c211dfb76ab292fa922f428e88493f assets\softerpastels\models\item\light_red_wall.json
635635
ed50a99e41ff5911f6472e5304fbb8cfb2e37d80 assets\softerpastels\models\block\white_fence_side.json
636636
f9786e6fca11a3f6884be4f43233f6121c4b0830 assets\softerpastels\blockstates\blue_carpet.json
637637
91a0dab4a828c9b146966953cd09a4df6a6d0c47 assets\softerpastels\models\block\light_gray_glass_pane_noside.json
638-
784579c516bd2ca87cacb03bfa3a5da9a8fca323 assets\softerpastels\blockstates\light_green_carpet.json
639638
a2925582e1e1b0a367fb5abb1bba4caa1246cab1 assets\softerpastels\blockstates\light_blue_slab.json
639+
784579c516bd2ca87cacb03bfa3a5da9a8fca323 assets\softerpastels\blockstates\light_green_carpet.json
640640
df7abe5a07a31357a9eccfc62cb874e48c7c493f assets\softerpastels\blockstates\purple_carpet.json
641641
205c8f52b81bb0934276a96ebf1041b3aee8e9b2 assets\softerpastels\models\block\yellow_fence_inventory.json
642642
311a986ae3a473d44ac334dbafd4becb08bade40 assets\softerpastels\models\block\orange_slab_top.json
@@ -689,8 +689,8 @@ fe9704b29441b527dcc699fc5dab250fac113937 assets\softerpastels\blockstates\red_ca
689689
bdd2c5c1a6d22df0c1de5c4c472468b7c0ba356e assets\softerpastels\models\block\black_pastel_powder_block.json
690690
ed686d89a6d9bb2dadd6c2ddaecf29031b6dfec2 assets\softerpastels\models\block\black_fence_inventory.json
691691
d042bee484855ced877113084ac99801eb391293 assets\softerpastels\blockstates\purple_fence_gate.json
692-
465731e202fab9d5e6f51d64f45121a9a00f314d assets\softerpastels\blockstates\magenta_slab.json
693692
a6943a0a7dbc6e91199919a33e5817d6eaf4e2cc assets\softerpastels\blockstates\gray_slab.json
693+
465731e202fab9d5e6f51d64f45121a9a00f314d assets\softerpastels\blockstates\magenta_slab.json
694694
f4164d30402e11969aa736fb03485e8ba178bb32 assets\softerpastels\models\item\light_gray_carpet.json
695695
a8d856c975e69829f9f51bc9b58978757e2fcd0b assets\softerpastels\blockstates\black_pastel_block.json
696696
5662e3e91a81b0667bcc95dfa251b4730a2a1733 assets\softerpastels\models\block\gray_wool.json
@@ -771,8 +771,8 @@ fddbad7de19a15180790fded8399c9e9a5794b7d assets\softerpastels\models\block\light
771771
9f9b3878795259fa3ee5e8649a5b8859d4ed95c1 assets\softerpastels\models\item\red_fence.json
772772
76007102eeb95a8fa068b871c1c341d9401de178 assets\softerpastels\models\block\magenta_wall_inventory.json
773773
0c9e524e58cc125ecfed9834b8cf4798c11f3783 assets\softerpastels\models\block\black_fence_gate_wall.json
774-
c8bf171d0eb6cdde16f48c7e67183f773817eedf assets\softerpastels\blockstates\black_wall.json
775774
e3f2509976e76220b065f7cf4ff2cdb2ff26999b assets\softerpastels\blockstates\black_stairs.json
775+
c8bf171d0eb6cdde16f48c7e67183f773817eedf assets\softerpastels\blockstates\black_wall.json
776776
7b1664ec9640157b91a7d775e5488fe4a51d66b0 assets\softerpastels\models\block\yellow_glass_pane_noside.json
777777
ab59959838f7b947162f7fe2fb3c232319ec01cc assets\softerpastels\blockstates\brown_fence.json
778778
d2371e5437210a4526c1f08f335aeceecfd00297 assets\softerpastels\models\item\gray_glass.json

‎src/main/generated/.cache/6fd965db78be348be380864e46300e44b5d9a3c4‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.5 2024-04-24T03:46:17.7753121 Softer Pastels/Recipes
1+
// 1.20.5 2024-04-26T00:38:59.0534871 Softer Pastels/Recipes
22
d38870c367e793b7337c29156913ca81be2feec8 data\softerpastels\advancements\recipes\building_blocks\red_slab.json
33
5047ad2ef625c86b109dda0b433ff7d0e52dcdfd data\softerpastels\recipes\purple_powder.json
44
312481ada3302cf02d61eaed4b12d24377a51e1a data\softerpastels\recipes\light_green_powder.json

‎src/main/generated/.cache/7a043e19002922390350846511628b1dda1ac32e‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
// 1.20.5 2024-04-24T03:46:17.7682831 Softer Pastels/Language (en_us)
1+
// 1.20.5 2024-04-26T00:38:59.0484543 Softer Pastels/Language (en_us)
22
1415801c2e231610918f971c6d7d6bd35fec2ca1 assets\softerpastels\lang\en_us.json

‎src/main/generated/.cache/b42239e3f9b6a964b12962361af9e622d2a6145d‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.5 2024-04-24T03:46:17.7647697 Softer Pastels/Tags for minecraft:block
1+
// 1.20.5 2024-04-26T00:38:59.043941 Softer Pastels/Tags for minecraft:block
22
40434514b50248273a51d9aefd63553470461c6f data\minecraft\tags\blocks\fence_gates.json
33
3b3f26fc98a0af95febdaec210b60d563c75e6bf data\minecraft\tags\blocks\beacon_base_blocks.json
44
431993e7c32e9fcdc7e86dfa94416e340b6bb205 data\minecraft\tags\blocks\walls.json

‎src/main/generated/.cache/fbff1b5601f51e23049a10a29256a74a801af9cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.5 2024-04-24T03:46:17.7633697 Softer Pastels/Advancements
1+
// 1.20.5 2024-04-26T00:38:59.0429319 Softer Pastels/Advancements
22
755485e6278a8e3116037c194db8309e827ea459 data\minecraft\advancements\softerpastels\pastel_candies.json
33
589b9118eee7b4bf463b7dd8ffa541bef18a7cd3 data\minecraft\advancements\softerpastels\pastel_hard_candies.json
44
9a746c55359ea657661bb72f99372f8aa4004475 data\minecraft\advancements\softerpastels\regretful_candy.json

‎src/main/kotlin/one/devos/nautical/softerpastels/common/SofterPastelsBlocks.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package one.devos.nautical.softerpastels.common
22

3-
import gay.asoji.innerpastels.blocks.*
3+
import gay.asoji.innerpastels.register.*
44
import net.minecraft.world.item.DyeColor
55
import net.minecraft.world.level.block.Block
66
import net.minecraft.world.level.material.MapColor

0 commit comments

Comments
 (0)