Skip to content

Commit

Permalink
Pushing Stable Changes, Fixed some Issues
Browse files Browse the repository at this point in the history
  • Loading branch information
Type-32 committed May 26, 2024
1 parent 3e94456 commit 6f257a7
Show file tree
Hide file tree
Showing 79 changed files with 2,015 additions and 2 deletions.
Binary file modified run-data/logs/debug-1.log.gz
Binary file not shown.
Binary file modified run-data/logs/debug-2.log.gz
Binary file not shown.
Binary file modified run-data/logs/debug-3.log.gz
Binary file not shown.
Binary file modified run-data/logs/debug-4.log.gz
Binary file not shown.
Binary file modified run-data/logs/debug-5.log.gz
Binary file not shown.
68 changes: 68 additions & 0 deletions src/generated/resources/.cache/cache
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,36 @@ dbce2df2c2a03cf2cf7ab42571bc1873309e057b data/prma/advancements/recipes/prma_blu
de465a6d7d11b70322e936216c9e7e551a1c3ef8 data/prma/advancements/recipes/prma_blueprints_tab/m4a1_stock_blueprint.json
e54521ef7e999b5de85add50014f79abe9d429c2 data/prma/advancements/recipes/prma_blueprints_tab/m4a1_trigger_blueprint.json
95397ce7f2ba802cba7e5b5a3962b1aaabb1ee03 data/prma/advancements/recipes/prma_blueprints_tab/m4a1_upper_receiver_blueprint.json
b03d94a008bbfd5df738ecf185fafc19ae754224 data/prma/advancements/recipes/prma_casts_tab/12g_casing_cast.json
92044aa74917165e15af8eac93594fc841669a38 data/prma/advancements/recipes/prma_casts_tab/12g_pellet_cast.json
0118f76369b738f62157c7d245d6264582a90517 data/prma/advancements/recipes/prma_casts_tab/308_casing_cast.json
64a38a728c1a48d3e129cf34d76442ef35f790cf data/prma/advancements/recipes/prma_casts_tab/308_head_cast.json
974ea5a99bc17e08d07cb8dde05b7b086e5e2990 data/prma/advancements/recipes/prma_casts_tab/30_06_casing_cast.json
2dd31e1356011ed861022ba2d5b7a9b3557c3c8f data/prma/advancements/recipes/prma_casts_tab/30_06_head_cast.json
53824b6f7848d578bfd51bdb1a648f370a18f598 data/prma/advancements/recipes/prma_casts_tab/338_casing_cast.json
f360082928c65e111aeb43d42117961cf1c1445f data/prma/advancements/recipes/prma_casts_tab/338_head_cast.json
9b07fd2f293700c294263da3e2efee9c6fcea711 data/prma/advancements/recipes/prma_casts_tab/45acp_casing_cast.json
affd8ab61763af7da4ad80327a7e93e8de755435 data/prma/advancements/recipes/prma_casts_tab/45acp_head_cast.json
dd7033e07d542f424f37b6efa2669b7ebdca2537 data/prma/advancements/recipes/prma_casts_tab/46x30_casing_cast.json
7794ec35eaa2ede02cd7a880649c5d00f188db56 data/prma/advancements/recipes/prma_casts_tab/46x30_head_cast.json
3eaa484641823501d7133a6d8811608fdf97af50 data/prma/advancements/recipes/prma_casts_tab/50ae_casing_cast.json
40bec9ddbff46be06a8739be1b009cb453a927f4 data/prma/advancements/recipes/prma_casts_tab/50ae_head_cast.json
ba55e0a28a775c7d31d2e7365b91fe71b6983fe3 data/prma/advancements/recipes/prma_casts_tab/50bmg_casing_cast.json
0d85289039cad7617474ef2c783c71101597fa68 data/prma/advancements/recipes/prma_casts_tab/50bmg_head_cast.json
a5ad9f97ef2603cd3ea3eae7fadfce49db242524 data/prma/advancements/recipes/prma_casts_tab/556x45_casing_cast.json
02485f15351a8fbbb09bd65642fecc1e945f49ba data/prma/advancements/recipes/prma_casts_tab/556x45_head_cast.json
aa3b3f3f6dc788a88837e84b650d591628562476 data/prma/advancements/recipes/prma_casts_tab/58x42_casing_cast.json
17b0848805ad2873fba0a7da48d58771fdd53fb4 data/prma/advancements/recipes/prma_casts_tab/58x42_head_cast.json
9ffe236b7a5724601155441475cc71dfdae19a69 data/prma/advancements/recipes/prma_casts_tab/68x51fury_casing_cast.json
b1394ff18b5f788ac2850c54149e9a1c7cbcf7ad data/prma/advancements/recipes/prma_casts_tab/68x51fury_head_cast.json
4ae6593c646b8bc4adbd5a1828fa1853d22be025 data/prma/advancements/recipes/prma_casts_tab/762x25_casing_cast.json
8b608f099b8fc9d2d43bcc5a7e548c3eca7921e7 data/prma/advancements/recipes/prma_casts_tab/762x25_head_cast.json
9b0064a3e2ac86f2765375622320507933d656f1 data/prma/advancements/recipes/prma_casts_tab/762x39_casing_cast.json
85081fddbd1c619f8e6ed974c7e765c05469972d data/prma/advancements/recipes/prma_casts_tab/762x39_head_cast.json
22717a12df4c04fa92f6a8c8d6c691ce0e641fa1 data/prma/advancements/recipes/prma_casts_tab/762x54_casing_cast.json
159b7943f90a655490ec01e3e145439a56e16d31 data/prma/advancements/recipes/prma_casts_tab/762x54_head_cast.json
f2e9b279f07336c0e43eb5b0b34bce71b090b655 data/prma/advancements/recipes/prma_casts_tab/9mm_casing_cast.json
273947b5edea877fe0ab970db623fe7945c51192 data/prma/advancements/recipes/prma_casts_tab/9mm_head_cast.json
e9f7ce77844ae0259ac6fc2ea824685f76fbf15d data/prma/advancements/recipes/prma_casts_tab/ak47_barrel_cast.json
c8fffbc90385c1211f702f57842faa02aec65c04 data/prma/advancements/recipes/prma_casts_tab/ak47_fire_control_group_cast.json
fbc3a2dd7f4ae05dd526ca031d1fd889c39711f4 data/prma/advancements/recipes/prma_casts_tab/ak47_fire_selector_cast.json
Expand Down Expand Up @@ -285,37 +315,71 @@ b057320e8f508759c74eb2ba54e1b136c6e068c5 data/prma/advancements/recipes/prma_cas
28128eec37458958960f91f161fa0bcd287cc92a data/prma/advancements/recipes/prma_casts_tab/m4a1_stock_cast.json
ea90aa704aeaeb8d10715fcb9a57c87dda7370e7 data/prma/advancements/recipes/prma_casts_tab/m4a1_trigger_cast.json
e56388796b15ec2c5bfebcb12753c9bbb7957693 data/prma/advancements/recipes/prma_casts_tab/m4a1_upper_receiver_cast.json
aabbd12037d82dcf9628e7cdb65fe6da010dc7d8 data/prma/advancements/recipes/prma_casts_tab/magnum_r_casing_cast.json
44950e2715391dbf77a8a60c79b6f095718ebf66 data/prma/advancements/recipes/prma_casts_tab/magnum_r_head_cast.json
b890d66fca6a143d0eaa07acdde4385dd100bc25 data/prma/advancements/recipes/prma_casts_tab/rpg_rocket_casing_cast.json
ac355f62aeed87faf9b4d247b3c257bd935b8d6d data/prma/advancements/recipes/prma_casts_tab/rpg_rocket_head_cast.json
997de50c25907389a98ca8d1c11204b53ddb7ee8 data/prma/loot_tables/blocks/decomponentalizer.json
5cda439e1003f9459ff2aa243a46971081230246 data/prma/recipes/12g_casing_blueprint_from_decomponentalizing.json
bcbd29992236cfebf6ef86742a8b0491ba82ba46 data/prma/recipes/12g_casing_cast.json
a2684a8633f230c02476894e00ae3d7bdcfcd87c data/prma/recipes/12g_pellet_blueprint_from_decomponentalizing.json
ddec7a44d42d8cfc4e62c157edf343baf666cbbb data/prma/recipes/12g_pellet_cast.json
95776bf2c7ebc7eb3b47f76618d1a9490ce28ecf data/prma/recipes/308_casing_blueprint_from_decomponentalizing.json
600741c7748366148fc37f99f9d6c42c0f6be153 data/prma/recipes/308_casing_cast.json
ca34684dc49bdf423becb2378751ab63d6c632e5 data/prma/recipes/308_head_blueprint_from_decomponentalizing.json
bb6744f9f797920f3a28587fc27d06e3cdc3b001 data/prma/recipes/308_head_cast.json
86ac70909cca2d3809498651794e70ac7c4b1d23 data/prma/recipes/30_06_casing_blueprint_from_decomponentalizing.json
f1e66333d59f8661bdc1052012500abea3b1bdd3 data/prma/recipes/30_06_casing_cast.json
7038e9e3dc96a43e076cde8f1d0ce21fa959a32d data/prma/recipes/30_06_head_blueprint_from_decomponentalizing.json
96ce4ca08d1439d0ffc75cabb8219c149ab3dde4 data/prma/recipes/30_06_head_cast.json
7e3b1661236535e7317a92a13d08c5bad5dc1d13 data/prma/recipes/338_casing_blueprint_from_decomponentalizing.json
30809dd06ac95663f9f5f48b34ad0a2543dded04 data/prma/recipes/338_casing_cast.json
8227d96ffcbc948e3c43552823f07c743d516894 data/prma/recipes/338_head_blueprint_from_decomponentalizing.json
0b48034b66c87cfcee38c946dfaca59c58ec5c52 data/prma/recipes/338_head_cast.json
9277fb2ce95b79e521ef0abbe1b0ccbbb11efe25 data/prma/recipes/45acp_casing_blueprint_from_decomponentalizing.json
c21c0342ee7caad9e486e811f2074408546304a1 data/prma/recipes/45acp_casing_cast.json
831e6249f3f8d3bc595d715af4e6704024cd0a94 data/prma/recipes/45acp_head_blueprint_from_decomponentalizing.json
130fa01c12b3fd0322cdf44b7b72c731ee04b854 data/prma/recipes/45acp_head_cast.json
80b431fd2d44cf8691394042dc801be2dfe318d1 data/prma/recipes/46x30_casing_blueprint_from_decomponentalizing.json
347ef848e9ec17188c1ca26751eb43d71acd9492 data/prma/recipes/46x30_casing_cast.json
4ba3b4890155d248612cfce9c0bb6029a87e7731 data/prma/recipes/46x30_head_blueprint_from_decomponentalizing.json
22fa1e81fc0a9039a7f8169cd3620ad46958c637 data/prma/recipes/46x30_head_cast.json
6b942e31c31a3487823a3278b28f57c43b086bfa data/prma/recipes/50ae_casing_blueprint_from_decomponentalizing.json
62f3100b8dcdaedc51b7b113d06c856bc6f897bb data/prma/recipes/50ae_casing_cast.json
392de83cf25eff548c48091b5321959a4fabfdd1 data/prma/recipes/50ae_head_blueprint_from_decomponentalizing.json
d79495efeb258df93f90753306f52a598b615792 data/prma/recipes/50ae_head_cast.json
f5d73a92f09c1d03915b86fa0c9ad6f323669fe2 data/prma/recipes/50bmg_casing_blueprint_from_decomponentalizing.json
55889856755ef910aeb389a7c06918064f6ead5f data/prma/recipes/50bmg_casing_cast.json
4f1a4cf958897f2e296199d09d2bff617cd7c905 data/prma/recipes/50bmg_head_blueprint_from_decomponentalizing.json
cf304c54ba25b09c1a87b0981c00f3daaad207cb data/prma/recipes/50bmg_head_cast.json
2ac2453904fc11bb97c1a24390bb16965b3a8ee0 data/prma/recipes/556x45_casing_blueprint_from_decomponentalizing.json
e78969b14fda0b81dac1dbf09e234bfe165485f7 data/prma/recipes/556x45_casing_cast.json
a50edb0fa136dc3fdf6524d79d7bbcb8f4505ed0 data/prma/recipes/556x45_head_blueprint_from_decomponentalizing.json
95d79d30a96f72d792830af432b06251c373346e data/prma/recipes/556x45_head_cast.json
21e06316f8974973c538bd8d9f101dfc933c0c9b data/prma/recipes/58x42_casing_blueprint_from_decomponentalizing.json
4e0c4a196f2f47f5c9b7ca8afc1c7cc55d10a15e data/prma/recipes/58x42_casing_cast.json
51b36e9ff3bcf29777b559343dfe13942d720299 data/prma/recipes/58x42_head_blueprint_from_decomponentalizing.json
bfe3e1a57ed661b7270be95c986e356be6da0c8a data/prma/recipes/58x42_head_cast.json
1136e44b08693c8b7ad436ca280a045589b7436a data/prma/recipes/68x51fury_casing_blueprint_from_decomponentalizing.json
0608524a8d1454e0fac7b7a1b57a014f748f557d data/prma/recipes/68x51fury_casing_cast.json
41a29d14f203cec1a7ea3ecade22dae802e70e55 data/prma/recipes/68x51fury_head_blueprint_from_decomponentalizing.json
ec982433e5a5f4855e9c0c1cc1b15d0a8cdc4184 data/prma/recipes/68x51fury_head_cast.json
f120d638312f930b12a7904c12401e1c3f12e616 data/prma/recipes/762x25_casing_blueprint_from_decomponentalizing.json
bf098943a78c61d9e0618e782ff20a1530d407a2 data/prma/recipes/762x25_casing_cast.json
899f622081c0f22ec93caab82d66eaed0b56e82e data/prma/recipes/762x25_head_blueprint_from_decomponentalizing.json
eaf5b16fe24085ca12fc58bd76b5677807a3f7f1 data/prma/recipes/762x25_head_cast.json
cb84e6bd1555ac8ef06d69d85a1acbd0fd1deb2b data/prma/recipes/762x39_casing_blueprint_from_decomponentalizing.json
b400c90b79358bf1f38738f1a80b8f7ca0e22074 data/prma/recipes/762x39_casing_cast.json
287c91b22c1606e7c064affaab57eabb270fbe01 data/prma/recipes/762x39_head_blueprint_from_decomponentalizing.json
0820102cc266f43758b04f536e5602874112531d data/prma/recipes/762x39_head_cast.json
0749ea5239410fd30e3729db1ad0fdde5350980b data/prma/recipes/762x54_casing_blueprint_from_decomponentalizing.json
5727ac889e01193711f1481921c1aa3a416fdf5a data/prma/recipes/762x54_casing_cast.json
b777013d7245c82a6a934c5664a472b48e4a7751 data/prma/recipes/762x54_head_blueprint_from_decomponentalizing.json
9e979bdd8da84ce4273aab1f2973aa37196c25f9 data/prma/recipes/762x54_head_cast.json
004a8202df2467da266e8d31e3d75ff1e1dc0cf7 data/prma/recipes/9mm_casing_blueprint_from_decomponentalizing.json
047a24fed566a7dd66b9859164fc413d5f5a6c61 data/prma/recipes/9mm_casing_cast.json
96ec5465d503d314219ca1a6223c408a49662885 data/prma/recipes/9mm_head_blueprint_from_decomponentalizing.json
222b8a414b32835c1aa0143a21efa4a17d222ec8 data/prma/recipes/9mm_head_cast.json
39895c68fcea151fc1e2f0605daf4b11a4bcd4c1 data/prma/recipes/ak47_barrel_blueprint.json
d5d0ed38be5b9aad9cce4f8fba9c45386ca10ee1 data/prma/recipes/ak47_barrel_blueprint_from_decomponentalizing.json
bac2e3c8999c3e40ffc51cd7d9a5e186d16ed97e data/prma/recipes/ak47_barrel_cast.json
Expand Down Expand Up @@ -492,9 +556,13 @@ a33327ae2b748ebdae6f21b62e6e8ba4ea1b075e data/prma/recipes/m4a1_magazine_bluepri
859e10512fb7fb6eba44fcf93c374c46231223f9 data/prma/recipes/m4a1_upper_receiver_blueprint_from_decomponentalizing.json
0d1e0183a295f7439a0d63d0b45b36c9427cfecb data/prma/recipes/m4a1_upper_receiver_cast.json
2ec5aa7526caae11d4f9e22a31ad863bdbac4926 data/prma/recipes/magnum_r_casing_blueprint_from_decomponentalizing.json
6758d66122831e2b3f20ac290db022175484be5b data/prma/recipes/magnum_r_casing_cast.json
b6f0435f7cb0d6c9ef480c8528c47b44f0d18c73 data/prma/recipes/magnum_r_head_blueprint_from_decomponentalizing.json
0a59c50cffc69f2befe6d4547adf86c9d4a78d48 data/prma/recipes/magnum_r_head_cast.json
7ecab4905f1658cc44792eff66851fa946abaa81 data/prma/recipes/rpg_rocket_casing_blueprint_from_decomponentalizing.json
ffcb3e89f60cb4f3c1a2fe567ffbbe1bfc70b0d0 data/prma/recipes/rpg_rocket_casing_cast.json
a312460dac47cb46b4f3f054de5e85bd21bf2f6a data/prma/recipes/rpg_rocket_head_blueprint_from_decomponentalizing.json
6ee5a280d796d7ef1b119b57adbbd5da6c189110 data/prma/recipes/rpg_rocket_head_cast.json
4ebf0c57dfab6f3643d28cf5255d19af48927d8d data/prma/recipes/sequenced_assembly/cartridges/12g.json
27ffc846ce5ac8800c45ad82c68598898d5d0127 data/prma/recipes/sequenced_assembly/cartridges/308.json
141612f129ac6f7f8965ff039ea449ea2236ba7d data/prma/recipes/sequenced_assembly/cartridges/30_06.json
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"prma:12g_casing_cast"
]
},
"criteria": {
"has_12g_casing_blueprint": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"prma:12g_casing_blueprint"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "prma:12g_casing_cast"
}
}
},
"requirements": [
[
"has_12g_casing_blueprint",
"has_the_recipe"
]
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"prma:12g_pellet_cast"
]
},
"criteria": {
"has_12g_pellet_blueprint": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"prma:12g_pellet_blueprint"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "prma:12g_pellet_cast"
}
}
},
"requirements": [
[
"has_12g_pellet_blueprint",
"has_the_recipe"
]
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"prma:308_casing_cast"
]
},
"criteria": {
"has_308_casing_blueprint": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"prma:308_casing_blueprint"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "prma:308_casing_cast"
}
}
},
"requirements": [
[
"has_308_casing_blueprint",
"has_the_recipe"
]
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"prma:308_head_cast"
]
},
"criteria": {
"has_308_head_blueprint": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"prma:308_head_blueprint"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "prma:308_head_cast"
}
}
},
"requirements": [
[
"has_308_head_blueprint",
"has_the_recipe"
]
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"prma:30_06_casing_cast"
]
},
"criteria": {
"has_30_06_casing_blueprint": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"prma:30_06_casing_blueprint"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "prma:30_06_casing_cast"
}
}
},
"requirements": [
[
"has_30_06_casing_blueprint",
"has_the_recipe"
]
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"prma:30_06_head_cast"
]
},
"criteria": {
"has_30_06_head_blueprint": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"prma:30_06_head_blueprint"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "prma:30_06_head_cast"
}
}
},
"requirements": [
[
"has_30_06_head_blueprint",
"has_the_recipe"
]
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"prma:338_casing_cast"
]
},
"criteria": {
"has_338_casing_blueprint": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"prma:338_casing_blueprint"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "prma:338_casing_cast"
}
}
},
"requirements": [
[
"has_338_casing_blueprint",
"has_the_recipe"
]
]
}
Loading

0 comments on commit 6f257a7

Please sign in to comment.