From 0f9ed4f2b528da900cb967fcbcbfd588a578ef1b Mon Sep 17 00:00:00 2001 From: Michael Hillcox Date: Fri, 25 Oct 2024 12:58:52 +0100 Subject: [PATCH] fix: added missing copper components fix: added missing loot tables --- CHANGELOG.md | 11 ++ .../mods/ftbmaterials/resources/Resource.java | 2 +- .../textures/item/copper_clump.png | Bin 0 -> 4683 bytes .../textures/item/copper_crystal.png | Bin 0 -> 4834 bytes .../textures/item/copper_dirty_dust.png | Bin 0 -> 4840 bytes .../textures/item/copper_shard.png | Bin 0 -> 4552 bytes .../3a2935601cd4a6dfdb3fdf60eca8c679a86e16b5 | 65 ++++++----- .../5059c8810f5ddcb87f7ac72efe0424a8544434ca | 24 ++-- .../9bf786761f354212767db7b8b27e571cfe33f246 | 21 +++- .../a47a9e138333f50e097c4082fce7f1018b693e3a | 4 +- .../addac0a0a12215bd45b5a22553aa70d2108a80a5 | 10 +- .../bb55705e4f2f8dfdebdc896fb86ebd24efb0c241 | 56 ++++----- .../assets/ftbmaterials/lang/en_us.json | 4 + .../models/item/copper_clump.json | 6 + .../models/item/copper_crystal.json | 6 + .../models/item/copper_dirty_dust.json | 6 + .../models/item/copper_shard.json | 6 + .../generated/data/c/tags/block/ores.json | 106 +++++++++--------- .../data/c/tags/block/ores/aluminum.json | 4 +- .../data/c/tags/block/ores/antimony.json | 4 +- .../data/c/tags/block/ores/bauxite.json | 6 +- .../c/tags/block/ores/dimensional_shard.json | 6 +- .../data/c/tags/block/ores/fluorite.json | 6 +- .../data/c/tags/block/ores/iridium.json | 4 +- .../data/c/tags/block/ores/lead.json | 4 +- .../data/c/tags/block/ores/monazite.json | 6 +- .../data/c/tags/block/ores/nickel.json | 4 +- .../data/c/tags/block/ores/osmium.json | 4 +- .../data/c/tags/block/ores/platinum.json | 4 +- .../data/c/tags/block/ores/quartz.json | 2 +- .../c/tags/block/ores/resonating_ore.json | 6 +- .../data/c/tags/block/ores/silver.json | 4 +- .../data/c/tags/block/ores/sulfur.json | 6 +- .../generated/data/c/tags/block/ores/tin.json | 4 +- .../data/c/tags/block/ores/titanium.json | 4 +- .../data/c/tags/block/ores/tungsten.json | 4 +- .../data/c/tags/block/ores/uranium.json | 4 +- .../data/c/tags/block/ores/zinc.json | 4 +- .../data/c/tags/block/storage_blocks.json | 36 +++--- .../generated/data/c/tags/item/clumps.json | 1 + .../data/c/tags/item/clumps/copper.json | 5 + .../generated/data/c/tags/item/crystals.json | 1 + .../data/c/tags/item/crystals/copper.json | 5 + .../data/c/tags/item/dirty_dusts.json | 1 + .../data/c/tags/item/dirty_dusts/copper.json | 5 + .../main/generated/data/c/tags/item/ores.json | 106 +++++++++--------- .../data/c/tags/item/ores/aluminum.json | 4 +- .../data/c/tags/item/ores/antimony.json | 4 +- .../data/c/tags/item/ores/bauxite.json | 6 +- .../c/tags/item/ores/dimensional_shard.json | 6 +- .../data/c/tags/item/ores/fluorite.json | 6 +- .../data/c/tags/item/ores/iridium.json | 4 +- .../generated/data/c/tags/item/ores/lead.json | 4 +- .../data/c/tags/item/ores/monazite.json | 6 +- .../data/c/tags/item/ores/nickel.json | 4 +- .../data/c/tags/item/ores/osmium.json | 4 +- .../data/c/tags/item/ores/platinum.json | 4 +- .../data/c/tags/item/ores/quartz.json | 2 +- .../data/c/tags/item/ores/resonating_ore.json | 6 +- .../data/c/tags/item/ores/silver.json | 4 +- .../data/c/tags/item/ores/sulfur.json | 6 +- .../generated/data/c/tags/item/ores/tin.json | 4 +- .../data/c/tags/item/ores/titanium.json | 4 +- .../data/c/tags/item/ores/tungsten.json | 4 +- .../data/c/tags/item/ores/uranium.json | 4 +- .../generated/data/c/tags/item/ores/zinc.json | 4 +- .../generated/data/c/tags/item/shards.json | 1 + .../data/c/tags/item/shards/copper.json | 5 + .../data/c/tags/item/storage_blocks.json | 36 +++--- .../loot_table/blocks/copper_end_ore.json | 51 +++++++++ .../loot_table/blocks/copper_nether_ore.json | 51 +++++++++ .../loot_table/blocks/diamond_end_ore.json | 51 +++++++++ .../loot_table/blocks/diamond_nether_ore.json | 51 +++++++++ .../loot_table/blocks/emerald_end_ore.json | 51 +++++++++ .../loot_table/blocks/emerald_nether_ore.json | 51 +++++++++ .../loot_table/blocks/gold_end_ore.json | 51 +++++++++ .../loot_table/blocks/gold_nether_ore.json | 51 +++++++++ .../loot_table/blocks/iron_end_ore.json | 51 +++++++++ .../loot_table/blocks/iron_nether_ore.json | 51 +++++++++ .../blocks/lapis_lazuli_end_ore.json | 51 +++++++++ .../blocks/lapis_lazuli_nether_ore.json | 51 +++++++++ .../loot_table/blocks/quartz_end_ore.json | 51 +++++++++ .../loot_table/blocks/redstone_end_ore.json | 51 +++++++++ .../blocks/redstone_nether_ore.json | 51 +++++++++ .../data/mekanism/tags/item/shards.json | 1 + .../mekanism/tags/item/shards/copper.json | 5 + .../tags/block/incorrect_for_wooden_tool.json | 88 +++++++-------- .../tags/block/mineable/pickaxe.json | 88 +++++++-------- .../minecraft/tags/block/needs_iron_tool.json | 4 +- .../tags/block/needs_stone_tool.json | 84 +++++++------- .../fabric/data/LootTableGenerator.java | 45 +++++++- gradle.properties | 2 +- 92 files changed, 1345 insertions(+), 446 deletions(-) create mode 100644 common/src/main/resources/assets/ftbmaterials/textures/item/copper_clump.png create mode 100644 common/src/main/resources/assets/ftbmaterials/textures/item/copper_crystal.png create mode 100644 common/src/main/resources/assets/ftbmaterials/textures/item/copper_dirty_dust.png create mode 100644 common/src/main/resources/assets/ftbmaterials/textures/item/copper_shard.png create mode 100644 fabric/src/main/generated/assets/ftbmaterials/models/item/copper_clump.json create mode 100644 fabric/src/main/generated/assets/ftbmaterials/models/item/copper_crystal.json create mode 100644 fabric/src/main/generated/assets/ftbmaterials/models/item/copper_dirty_dust.json create mode 100644 fabric/src/main/generated/assets/ftbmaterials/models/item/copper_shard.json create mode 100644 fabric/src/main/generated/data/c/tags/item/clumps/copper.json create mode 100644 fabric/src/main/generated/data/c/tags/item/crystals/copper.json create mode 100644 fabric/src/main/generated/data/c/tags/item/dirty_dusts/copper.json create mode 100644 fabric/src/main/generated/data/c/tags/item/shards/copper.json create mode 100644 fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/copper_end_ore.json create mode 100644 fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/copper_nether_ore.json create mode 100644 fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/diamond_end_ore.json create mode 100644 fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/diamond_nether_ore.json create mode 100644 fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/emerald_end_ore.json create mode 100644 fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/emerald_nether_ore.json create mode 100644 fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/gold_end_ore.json create mode 100644 fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/gold_nether_ore.json create mode 100644 fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/iron_end_ore.json create mode 100644 fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/iron_nether_ore.json create mode 100644 fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/lapis_lazuli_end_ore.json create mode 100644 fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/lapis_lazuli_nether_ore.json create mode 100644 fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/quartz_end_ore.json create mode 100644 fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/redstone_end_ore.json create mode 100644 fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/redstone_nether_ore.json create mode 100644 fabric/src/main/generated/data/mekanism/tags/item/shards/copper.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b8c29c..d81b940 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +## [21.1.0-beta.2] + +### Added + +- More copper based items + - Copper Shard + - Copper Dirty Dust + - Copper Crystal + - Copper Clump +- Loot tables for vanilla resources that are produces from modded blocks. I.E Raw copper from Netherack Copper Ore + ## [21.1.0-beta.1] ### Added diff --git a/common/src/main/java/dev/ftb/mods/ftbmaterials/resources/Resource.java b/common/src/main/java/dev/ftb/mods/ftbmaterials/resources/Resource.java index 6c38112..45333ad 100644 --- a/common/src/main/java/dev/ftb/mods/ftbmaterials/resources/Resource.java +++ b/common/src/main/java/dev/ftb/mods/ftbmaterials/resources/Resource.java @@ -11,7 +11,7 @@ public enum Resource { BRONZE(builder().noOres().noRawOre().noRawBlock().noGem().noCrystal().noShard().noClump().noDirtyDust().build()), CHARCOAL(builder().noOres().noIngot().noBlock().noRawOre().noWire().noRawBlock().noNugget().noPlate().noGear().noRod().noGem().noCrystal().noShard().noClump().noDirtyDust().noBlade().build()), CONSTANTAN(builder().noOres().noRawOre().noRawBlock().noGem().noCrystal().noShard().noClump().noDirtyDust().noBlade().build()), - COPPER(builder().noDeepslateOre().noStoneOre().noBlock().noIngot().noRawOre().noRawBlock().noPlate().noGear().noRod().noGem().noCrystal().noShard().noClump().noDirtyDust().build()), + COPPER(builder().noDeepslateOre().noStoneOre().noBlock().noIngot().noRawOre().noRawBlock().noPlate().noGear().noRod().noGem().build()), DIAMOND(ResourceLocation.withDefaultNamespace("needs_iron_tool"), builder().noGem().noBlock().noDeepslateOre().noStoneOre().noIngot().noRawOre().noRawBlock().noBlade().build()), ELECTRUM(builder().noOres().noRawOre().noRawBlock().noCrystal().noShard().noClump().noDirtyDust().noBlade().build()), GOLD(ResourceLocation.withDefaultNamespace("needs_iron_tool"), builder().noDeepslateOre().noStoneOre().noBlock().noIngot().noNugget().noRawOre().noRawBlock().noBlade().build()), diff --git a/common/src/main/resources/assets/ftbmaterials/textures/item/copper_clump.png b/common/src/main/resources/assets/ftbmaterials/textures/item/copper_clump.png new file mode 100644 index 0000000000000000000000000000000000000000..302364598eeacb07a66d0027362da06d3da840ae GIT binary patch literal 4683 zcmbVO2{=@38$PzOM6!m;G~#P9X0cC=T}F|8tHhXvVYX(*GAgMkku4-^LP-s!%_Li; z>_m|)*-2ps_Xy$>-(4MpKH!J?|I+*y`TG8&U4O1+d~%OqKcvb0Ek^Bu#x2znb^8v{U5tk^O}2mnMaiKeEu40{U`kfph)4qRVH2ZGRm0|5GB zhC`rh!n~Y8?>v5^vq{HPQ8MWa09IiO*GRf$OI`*rVUkitFT*25on>S==yDUQd1L4%DYf{KY+pd%K71dt zLpjz4T~%8a$}fxV69h?))IawYdI7DBYR7} zFc8fLr0lfV!Ef{w@N_z3ug+ij9LQoDfi(mx3;9Cb9wRLHL(7DKfEd@fjYgh8Xo`t? z0|3(F2TZp~Hwu8P1hQbQ6@B?0v~UiZ52&n9YD_-Zswu-sdaW4vWvXvr`@nNjkqJhA zmn1=C2%MgrrXr0V6|idB004>$Ezef<4C6*ehWbYcqa^Ovm)Wa+Q&h0Q_UYc$(o6h; zfaIZOZl}laaJvAln(v-}g0NNw>=Ma3Ec!ZlA&RB9Y_u)&x^2zAty@IJ z#3og}u9v|EqYS=l_EY9}n9+Jc6F6mlRAsd~ z{Par9u9g9uILd7H{ZkJmq{ zCsl@g=Hri&aBU3$j6!B0mlVa~0ZDHy1Zy4u5-JvAjrQ;Xjmf!#08sjI^U+(0@>Z{e z0l+Nl%o+`;VOL6|KigVbDbJ5tXJ)ivN98_AlXXL(TSTvKzGAH4Sc&Wqd~{Dh zF>6z5zvRPba6R$SKB=Q;#%c2FJU3@P-&}fLM9{cKSQ@h(8L`PLrUTq0ET0l12*#kb zE{EoV#v)|wz%Og)x%~MizVYs8l`jywjDGY{qs6$c8W19KIkMCOo_OZIoxoduf1@Y2 zlocaiWieWqS{vO%uVnkRC_dbV3VocN*K+WqKNC0=8G{XNflClBy~iBAbiv&7qN}1> zwH$WXRogjM8@tt2H$YaYG84lU-oYOgDm@{5EKKq_>1m4{L#!Y(4` z!r;&U04LnCd8isJwNMr0g)EA5-OpD0ynWmDOx0t5NJx7mpm#{rULHCmx?MF6VJT+m zhwef{avgFFS|y3;R%+vMC{DUq%dAiDd7v&rOs% zpp7>i7QAr{VUm({+paM`^R4jh2;{ZHmgKAeTd2c@d}%HJRMo~bIn(-FNKV`9RH8R= z-Um9yED`BBx6M5Hb#klU$Ms{QW9PmGZV*2&ey$qrwNt@Q;eRX$kAZDUjfL*r|p%>_@+=L{7_8 zSpTg}^*$x>RX#Z_mN|cL)IMME9@Gw!Hz2U7TfEp>AMo9N`!HTaL|1NA?#rR_U5$x; zsf3c2hi{k-4K?cB><)JAM2vo0x?d)y{C#QHa&-6&^YoVoqI9CFuXJ8HSub?O`pP`} zs#kV`N+*0` zc|vp|bz(-Wwb@?Vq|u$tZ8>ZvWVb;234hm{s# z4Qf`~+Be0VZx-&A458j!uo`Q4EF95iL5kog6BSbA7f#9S+Ksra@yYI?1M@g@UcH?? z^)_==yTp?zyB*u5gYqGtaydXPgG{Coz2=m zu$$i>e-F`5OixVDu@@&^dAR2ttaxX!4Pnoo1o0u(2)Rxv;X>W~kjesMrc0I-Zq<_W z(7w=CLe2_$YfsRT%}0Vb=rZ)-x0=0#)lUm5VrS(}mc`w(<=lJF!3lDk?gLktKb2F7 za*z+yfVhE7!u^n)=clzSX>i!aAf3Ee$4bwemU9^(&6Km@!gb8GGW!iS={l+;LwfmDGK=qT;>?*KB67oE%DrV_}L%5 zH&31zwEcL!=|%U8#@>|E#k0cWXx5%qWQ9K)l0(iyT`%K)yp)r%_1IR6^5X9yT=*c? zzgj!iB{M5yCu(|O=xoAZ9xg94uI*{axMzINur zXsr8GDeWtG-m6Qs_+SC55M>cUTj@vNJwhGF&(}}7>?>q`wI1Kw!hLgk(YLaV@$TC@ z4fkuTGVZGhrDBR&&lZkq$?Ug)xk>pz(a%=h?!mD^cbCgMS3a#@-1zDA!_^{uCAsgL zXQgNJ3%8A236Tq#tBK#=T2Eo1v_%B(7NY1=p0&pLah`y16dI`8#Wz zac8u5Wnk%Gv+Hull-NR4b44L5e}>MzlYbXktx~OA+QdRl-&`(e>N>^ca7%it%al`g zE*q`d&a^CItMgvl%o~iJTwR9Fhs`WOEcBXrADJL5+TI!fg4F;ZGzA~duc0{}Es)(*a)8-@V@AXH9tbY;3)TOqMjvIYi6^}=fe zk!d_M0PHgiqG7OpcqYgT?@gqjz}%-5U=R_90=sBi!>nnhcpoAWTXn3y04g`x6`!3@v9(up)CkxBur zF=D)^{!A2@C-qMs$h6C zWbm-?-&mRtl}TmzQ2!0}@8!Q3;KkP3`nQe0)j}r!Ho;(;2k_kZ8IZq4GaOkoJk%b~ zp!(CXc=G_BOqDfnXh>5!9>b*49jR2(uT0tgk_yDVShrcsW>8m^;alD(-E$T)J7n+^#20o6%7u<#Qaw< z4vQpE>0}JgVv-uBV1!@$ZRorYL<)xVfAg$8aceb!L=zdj zY_Wbm5)Sy|KSv}Y=tmhKG1#^8MuD+wdBx+vKc|U*6M_HDgFk5leegWe|B&uKVGJsP z8Hl0djlFr%`tS7w{dejan1KJR{eR2e-)aAw`uo4M{|qeF2Sf43^V%g8yygvbt*`u< z7U;ib?8n+a^`KvHUSnGu{%)zfo8L_tPvKG1c`Y{y5>5pGzHCb~V@JK{8wrgEmF#3J zn!{QmJe(ZE4kUduzb?q;2(MEW+V%GG%f7nMC5>F;&GIYKCF(M|pGzVVHFlewjo`o( zcl+~e_!^0NMT_j81RdBC-88=YT#Cqn+MboZo|&dHn(B7Jq{KVfpDzHZw}q{pwzVbH zMQ7zlPK6O_)GauxCpH*;;NXWCj=^t@9AsNi+EMlH=XSWXAihSH9zVDg#b*$`5gEdG zpT<{y^6JQb!yDJ%)sMCBF6cRx&ZP{FlLCxzdt0PapOtOtryb9HKsujz45X(Q3FCGw zJsI2l4zV*YvsJ8Aq+GQ`()g+x>O(T1DtB3u-`c5aW?uQp(>iQA4n`-^r&T{?&eES; zd#>I+H5e;VNwayH^r9#ir|@yFh*6x)_nVJjn2uKM?IzpgkAM2(&NTta^bJWkzp&^Y z0s6Szr9mz0W6Jau>7m8_N1fVKKh2T&o)_iHe1FvZtXN;7q8WS4Bi?;M)F_Rs?I#jl z6k4(40@kv&)3_+IUP0_zyr0tRK%Mu<655d00|C$VvXc`Ft6ld)zvoBZomSS8sBVk( SuCrQuyIPtbGAlIkJo^uv80b#` literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/ftbmaterials/textures/item/copper_crystal.png b/common/src/main/resources/assets/ftbmaterials/textures/item/copper_crystal.png new file mode 100644 index 0000000000000000000000000000000000000000..bb1fb32812e3dddb012c324fca473556bd6f67d3 GIT binary patch literal 4834 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 X+X};y)SgJL9{uK~2Tcl$Tu=WC1=R|; literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/ftbmaterials/textures/item/copper_shard.png b/common/src/main/resources/assets/ftbmaterials/textures/item/copper_shard.png new file mode 100644 index 0000000000000000000000000000000000000000..c3e8631982c4c912c51b5c42f780b0050dbf3e41 GIT binary patch literal 4552 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 literal 0 HcmV?d00001 diff --git a/fabric/src/main/generated/.cache/3a2935601cd4a6dfdb3fdf60eca8c679a86e16b5 b/fabric/src/main/generated/.cache/3a2935601cd4a6dfdb3fdf60eca8c679a86e16b5 index 95690e7..899de88 100644 --- a/fabric/src/main/generated/.cache/3a2935601cd4a6dfdb3fdf60eca8c679a86e16b5 +++ b/fabric/src/main/generated/.cache/3a2935601cd4a6dfdb3fdf60eca8c679a86e16b5 @@ -1,4 +1,4 @@ -// 1.21.1 2024-10-20T09:29:55.638896 FTB Resources/Tags for minecraft:item +// 1.21.1 2024-10-25T12:55:11.49359 FTB Resources/Tags for minecraft:item a4187e6bede0d3ba6cf37376ebdcd5478302c936 data/c/tags/item/storage_blocks/raw_tin.json 6adb3e93e1dd3ea4692f38815ff3eb61c3b1b84c data/c/tags/item/ingots.json fcad3de8bfc91accf8a00da40a3b41b18a0eb30c data/c/tags/item/ingots/platinum.json @@ -16,7 +16,7 @@ cea4d3ec552cc08c3ea33b87fa4af4853e25d3ff data/c/tags/item/dirty_dusts/sulfur.jso 54315a877275ef02849585a1374fabf37551a0f6 data/c/tags/item/storage_blocks/silicon.json 91161ad0bcf2205726f4c29c670dc4c84fe766ef data/c/tags/item/gears.json 01f67b6f1d87b9fba4ed87481b4bae14c8c68716 data/c/tags/item/ingots/antimony.json -84fe8dfe2d1c38b66ccad929723fec9b61c531ba data/c/tags/item/ores/antimony.json +9254ada52d1a5b2109ecba81ceee405c603edcac data/c/tags/item/ores/antimony.json 1502d956776974ec41f09624143832d0aa535f7b data/c/tags/item/wires/steel.json 3fd5d4bec6d6cd8b1d84ed9a6247886a7d050186 data/c/tags/item/ores/lapis_lazuli.json c03b958c9f47fae2356189a2f45c3e00edad8c75 data/mekanism/tags/item/shards/plutonium.json @@ -29,12 +29,12 @@ ab6703ac03e72a5159ec7836d630fb2d7fa69b89 data/c/tags/item/clumps/tungsten.json 01003ad92d3108ded98e8568175f5a5759cfee3b data/c/tags/item/dusts/tin.json d3183d4120c3ea3f4a6a7552b15fd356537613cd data/c/tags/item/gears/uranium.json 7dbc140f1eb504057663654c412b4430b6617772 data/c/tags/item/storage_blocks/lead.json -dd7b5906be10005cf886244dac898320034af5db data/c/tags/item/dirty_dusts/zinc.json e7b3fa4d986e324b437ac6fe6eac0dbfcf8d6dd6 data/mekanism/tags/item/shards/silver.json e2856bc88016f00b2e044d38b93a6e8b19364d49 data/c/tags/item/wires/lumium.json 6d46af8c0e61e3965ba1a0ab8d217337142bdfa2 data/c/tags/item/rods/iron.json +dd7b5906be10005cf886244dac898320034af5db data/c/tags/item/dirty_dusts/zinc.json c1065bf67666f1fdbf5697f15c607642f91c7ad0 data/c/tags/item/plates/refined_glowstone.json -c37dc49c21d07e62d5bf40a724f3a791b9b02b9e data/c/tags/item/ores/platinum.json +e665fc2a0742c499b3f9c6bd756d34734a2e0b2a data/c/tags/item/ores/platinum.json 4d1e5a77b55d96af65d4597075cf6b4f929d453b data/c/tags/item/raw_materials/uranium.json c7f4f94d0892e97737ddeb8264c2284de4b8a34c data/c/tags/item/raw_materials/chromium.json eb8b2d60e3ce4c4548b983b2d97076e20faf4160 data/c/tags/item/plates/brass.json @@ -55,6 +55,7 @@ d317071332c48a9994eea90f1797c865fde337df data/c/tags/item/raw_materials/nickel.j bb4152dfc5af74b41cda1f2dea88fec0a851e3c7 data/c/tags/item/plates/platinum.json 4bc38dfdee3020f108af38de4f5af488d69109d2 data/c/tags/item/storage_blocks/raw_platinum.json b90393abe0b7f53712927e61b3dc9503997664d5 data/c/tags/item/clumps/titanium.json +2e4b598a9f9b527fd1b0df4e98eb4c3dac12ae62 data/c/tags/item/dirty_dusts/copper.json 0be35ead883b3f57b9a66efe8cdde7d692d16771 data/c/tags/item/clumps/brass.json ad916d42f824e0b89ace8b0da790756d83441732 data/c/tags/item/raw_materials/tungsten.json 0e64197f7d7d6c7eb07725e2d23888a694e13278 data/c/tags/item/raw_materials/aluminum.json @@ -70,6 +71,7 @@ ee8407d215fc228bcf1990981f2f41f2d7363531 data/c/tags/item/ingots/aluminum.json 15e37344b0cd0a41c47c1b3d6b2f0e7c199f834b data/c/tags/item/raw_materials/osmium.json 6d621c269b59f4352d0a16099eb77a89ee63b37a data/c/tags/item/gears/zinc.json 5c65fd6c03790d5e3e274b2365257a7fe410ca9a data/c/tags/item/crystals/lead.json +1669565aecd738cf3ba17990dfb12999bae2751c data/mekanism/tags/item/shards/copper.json 44a10713f0e3372dbd085ebd108845ee660379af data/c/tags/item/wires/platinum.json 02e0481409f16d6cdc06b268ae7607d4017302ba data/c/tags/item/storage_blocks/constantan.json 3df1e3ef34777db1b4bc4c22d76a5ff8c89b4072 data/mekanism/tags/item/shards/lead.json @@ -80,7 +82,7 @@ c5242c9f7357d8001ea14085d582ef38f2cb8f8a data/c/tags/item/shards/diamond.json 0fe24d01ec4c2862a9b84cbffb33f89c3cf7255d data/c/tags/item/nuggets/steel.json 811bb629fe83bd5f775993d667a76db2e124b31d data/c/tags/item/blades/aluminum.json 99dd0918ca49385247b4ee5f0c9f45775d85b4f3 data/c/tags/item/plates/obsidian.json -a90b8a0b41a3de1fb18b7e181b33dd0e19975ef2 data/c/tags/item/ores/resonating_ore.json +8532c8b1084d702cdaa2a70457e0aea02ea9acbc data/c/tags/item/ores/resonating_ore.json 9fa2bc6ea3f9cc1fe59ca2439271f0c0fdca4b4d data/c/tags/item/crystals/aluminum.json 890f17a6ae35693d5bfbf81f7796677d1b3ac675 data/c/tags/item/gears/electrum.json 190c09966dd0fe94860a832661a6673cdd98e860 data/c/tags/item/plates/aluminum.json @@ -131,7 +133,7 @@ c45d376bc2585b12993a1ba88c73bcef85e2a724 data/c/tags/item/crystals/uranium.json fdf478ce0c6d8e36d4a3472f1c79392c6d589214 data/c/tags/item/blades/plutonium.json 159f53e62820dc0a4da9b03d3aae9a1ee6f33f61 data/c/tags/item/wires/gold.json d841c9abaa92722bb62d3537aeb34d0da46b583c data/c/tags/item/shards/nickel.json -c34c6675b1ddc340270c1d5bd8b43733d6cddf1a data/c/tags/item/ores/tin.json +2dc4355775ae68174fec46ab2aa014d4b5198c90 data/c/tags/item/ores/tin.json a5404daec7f9dda0b70594a0a19d73255cacd4ed data/c/tags/item/storage_blocks/sulfur.json 8a5433365bbf93cdf326001e9ced76a6c93c427a data/c/tags/item/ingots/refined_glowstone.json 9cfacb1a637ea22f8b43a1b2eb03d816cdc7db42 data/c/tags/item/wires/lead.json @@ -140,7 +142,7 @@ c5242c9f7357d8001ea14085d582ef38f2cb8f8a data/mekanism/tags/item/shards/diamond. cd40a08fb224e0adfcdb08bc731039de82b78771 data/c/tags/item/storage_blocks/osmium.json 7533644fedc8b55e3130127e944087a1c1f7ffff data/c/tags/item/dusts/chromium.json 645166a4577e04fd21d20f5fd43e255c021cc758 data/c/tags/item/plates/uranium.json -c010247908cce52d8419ee4ae09ab225644b3f91 data/mekanism/tags/item/shards.json +0145feed62012de6e2c44b378baeda342a969e67 data/mekanism/tags/item/shards.json ce96a649f01f0e5ce0332eb4729cf97d55915eba data/c/tags/item/gears/platinum.json 6f6c9763b1d376000629c2877f0c1386cddba0fc data/c/tags/item/gears/osmium.json ee4dbe1aeff32e38aef0c8210e2766e0e58e1b94 data/c/tags/item/gems/silicon.json @@ -171,19 +173,19 @@ c6638bd1e40ef32dfe043bea46415c92d2399e35 data/c/tags/item/nuggets/constantan.jso 500eca458c6ea0d8d90b659820db8da3ee395201 data/c/tags/item/clumps/aluminum.json 63ebbdbbf7ddd8ddcc8e5d1db45e2bec620487ba data/c/tags/item/wires/resonating_ore.json b52bba5405092a63f71579f677fbc28a14095671 data/c/tags/item/plates/chromium.json -eb3c6ee1d93db2cdea78cae95e4accb468286218 data/c/tags/item/ores/bauxite.json +f4fb764bae7bd91db1f1898b3aab0c14f69924d9 data/c/tags/item/ores/bauxite.json 2380d810c045310eab6903579c2e97df6ed5e9a3 data/c/tags/item/dusts/silver.json f1b104f6495e5c44b5cbceb2eece92bf9dd8a616 data/c/tags/item/gears/silver.json a9f337b6670d3139009c5c887710e8ea919bca27 data/c/tags/item/clumps/platinum.json -749023d5c3df64b389d4142966bb9b46f9af5454 data/c/tags/item/ores/silver.json +f5ffe29cb43e3a190c69ca81b5783f95686553d5 data/c/tags/item/ores/silver.json d996ed9f29f02c041a295f6c1f392a49e78b5e06 data/c/tags/item/storage_blocks/bauxite.json 77cff227c3c0370c1c0b5f88d6744deef81d7ef7 data/c/tags/item/wires/stainless_steel.json a99011fd1274cfcf2afb075145a8f246791bcf10 data/c/tags/item/nuggets/chromium.json 9ee5f94309d97de79adb8834e1ae63e810969ea8 data/c/tags/item/dusts/tungsten.json -d008bbf6a3110879e231ed7e3f51a59b7802986b data/c/tags/item/ores/fluorite.json +a054754124f25351e7c7c852ab34df687abb422e data/c/tags/item/ores/fluorite.json 3f9568404bf1787485d8f76190d99a827fefdc35 data/c/tags/item/blades.json 62e79332f9567a83d99ca640ec1e540785cdb5ab data/c/tags/item/raw_materials/zinc.json -23254724651061fe203d9b1ab434f9c0b1f63ba9 data/c/tags/item/ores/monazite.json +f6cf298c5d81bd756d126c73bb6456e10e8ca8f2 data/c/tags/item/ores/monazite.json 4b9be672f24ecce65b1204c2541315adf827eb57 data/c/tags/item/shards/iron.json ea95f88999f600ee1c6de3f2df6c37474f0e110e data/c/tags/item/nuggets/titanium.json 816836127ba59c822e670b5d6113f7f155cad28a data/mekanism/tags/item/shards/tin.json @@ -200,36 +202,37 @@ de0ccae4d52426a846af1ae69967c7276318fd50 data/c/tags/item/dirty_dusts/plutonium. 3d22c4008957d09d62b1400888ee47d4d5c3f3b4 data/c/tags/item/gears/diamond.json 73dce7aa5aa0d4a202d953c475df5c8368931863 data/c/tags/item/gears/brass.json e05a99c09be314d20a8f211f890132c27a0d97f3 data/c/tags/item/storage_blocks/bronze.json -8933f47de58aac7068bfa1083bd04830c437e2ff data/c/tags/item/ores/zinc.json +cbb30e2b1eecdd98baf552f5568652e225f541cb data/c/tags/item/ores/zinc.json 0966ecdd53f5359b7586f2ad4ddce682dd3706f8 data/c/tags/item/gears/refined_glowstone.json 85975b3ad2e821722cfd7f4be8513a1ef3381541 data/c/tags/item/gems/silver.json da52036cf842082545959b18a193792d6ba56a55 data/c/tags/item/wires.json -d3d9df5a95e65b8fb33b65394284abda0c04a57d data/c/tags/item/crystals/zinc.json f24411ac5c9d460b499059c229f438bceb9b92bd data/c/tags/item/plates/silver.json -fd57e19cc1f2a237f77476a65cb30867f5a50f0e data/c/tags/item/ores/sulfur.json +d3d9df5a95e65b8fb33b65394284abda0c04a57d data/c/tags/item/crystals/zinc.json +58f94ab247a3554d21098266ef6c6ee030e4b6cc data/c/tags/item/ores/sulfur.json 5cba43109fdc8eb4e5a711c6f4d53860a8426c43 data/c/tags/item/shards/gold.json ef58b2f8e94707a737f58ef31ffff1cad3975c54 data/c/tags/item/gems/plutonium.json 7b64fcd5bd02e4f15529970b7a8f8f00130bbd72 data/c/tags/item/ores_in_ground/end.json 46f797dea833eaca299371cd7e62c863a06ad175 data/c/tags/item/nuggets/aluminum.json 0ee55da76b6f96d2e8155023b345f08ef321b947 data/c/tags/item/dirty_dusts/antimony.json -db5855f662b29f76c5d25431941c3f204ca42fbe data/c/tags/item/ores/quartz.json +2b0c9ce82aafa0b47b0d456f73a655199cdbfba7 data/c/tags/item/ores/quartz.json 9eab61f8c956c9a065a50d2a4475b39cfc3acc44 data/c/tags/item/wires/antimony.json 7b741119a842f9ad26dbd0646c5f466abcacbe45 data/c/tags/item/dirty_dusts/iron.json 827848354e468c9c58f063edc1c6f5d2f2b4823e data/c/tags/item/raw_materials/plutonium.json 8a6a204f3f2f45c7935789241252cb276a9a8201 data/c/tags/item/storage_blocks/raw_osmium.json -fdcf0e4352189021a249a1e4f3f30c7abf660ce6 data/c/tags/item/ores/osmium.json +6893f1807665471fa4afaf9527a09589ec054df1 data/c/tags/item/ores/osmium.json e300f9b0f2946e023941ed735049ec323f1bb20b data/c/tags/item/wires/dimensional_shard.json 8f5bf4fe0c3b2c2bedfd070fa78e04d39d23c8a9 data/mekanism/tags/item/shards/zinc.json dcfb121d2aed20733519f25c8f2d859894f96566 data/c/tags/item/gems/chromium.json f42cbd481d1c5d5789a23bcdf1f50211739e5c7c data/c/tags/item/shards/chromium.json 5efcdb8374c2dbb55df689b9ae58ebfeec2f0f6a data/c/tags/item/storage_blocks/tungsten.json 6f2b54ae15e1c9a52af6f03930fc4c7e389d9f7e data/c/tags/item/plates/quartz.json +4219978fb56eeda6166c498450e1916ef85559fb data/c/tags/item/crystals/copper.json a2aade5fc2514f3d4973609163815efe09759be0 data/c/tags/item/plates/osmium.json 5922af1c74932024bfc6373cc3a1674aedff5b3f data/c/tags/item/storage_blocks/platinum.json 68de29b4bca381357974af387f6a4e3e1e405abf data/c/tags/item/gems/brass.json a47e2a3ea553bcf850be784cd4c3c27d81a871fd data/c/tags/item/storage_blocks/titanium.json 6577519ed942d85f90e8e3e78c4d9a01e3da0dd7 data/c/tags/item/plates/lead.json -f42326220099d79a2c3991a03cafab9b2932bbdf data/c/tags/item/ores/uranium.json +fd328ebe6cf768a4c9a0f88a084c295d1b7e9c33 data/c/tags/item/ores/uranium.json fcf6207a6b3917048744207a326f724d93ffdaa9 data/c/tags/item/wires/refined_glowstone.json d827a59b74e30e2a7763269ad8c2080a9a7368f3 data/c/tags/item/dusts/brass.json 70ad867f3578edfa61269c8e1971d9464dab2d01 data/c/tags/item/gems.json @@ -252,9 +255,9 @@ d49b03355b7717b14d3760bcfa47e5712734d8c6 data/c/tags/item/storage_blocks/tin.jso b28d0f1b2db204930ae9cdde8ebfb0ee47037bf6 data/c/tags/item/wires/sulfur.json 0483e82ad99a6ab0f326cc39aa3fa1ecc90680b8 data/mekanism/tags/item/shards/brass.json bd7f96f85380d4907fb79925cfa0544a45372c8b data/c/tags/item/storage_blocks/silver.json -c37b7cadb30ae92ebbc56dc903cf026af17590f4 data/c/tags/item/ores/lead.json +acc6e14f075ba65c115ed522a12882105a792128 data/c/tags/item/ores/lead.json 94758e8588355fcef75ed0a10bc2c6fd79fce1cb data/c/tags/item/gears/stainless_steel.json -1cb6a3ae30213ab789d7d7b8d99a315a7a441de7 data/c/tags/item/storage_blocks.json +7044f7ccc21cbcd52d2b173f599701fec147d05c data/c/tags/item/storage_blocks.json ac113b106f470fb356dd7199619d406a7ec4c6db data/c/tags/item/gems/resonating_ore.json 463f81dc5a8dfe6f9cbe467c8fb232884c85a94e data/c/tags/item/wires/silicon.json ad5ba73fb6ec601bfdffd69cb02bc3f5f649ea1e data/c/tags/item/dirty_dusts/tin.json @@ -276,10 +279,10 @@ bdf98f3065c7c4277033cc4382a214eb704f8d78 data/c/tags/item/rods/tin.json 493fad845f5af4ee2175e8b44b218bd76e9e53d2 data/c/tags/item/crystals/sulfur.json 730e9562e75728de9ed9050d744723d147e71c8d data/mekanism/tags/item/shards/osmium.json 555ca2aa11d80139e557c04865b0f8e9049b5ca7 data/c/tags/item/dusts/bauxite.json -b75a39bcc392380df808ec286901851a5dcdae5d data/c/tags/item/clumps.json +7c5a92959d6dd2ea443c14747261b8f429cd341e data/c/tags/item/clumps.json d841c9abaa92722bb62d3537aeb34d0da46b583c data/mekanism/tags/item/shards/nickel.json 209734b2925f4abc95a8b2993a92be0d77b0896f data/c/tags/item/rods/plutonium.json -d1dc5cc23ee0ccd4dc060c490c5155a99dbe6ad8 data/c/tags/item/crystals.json +368130469e04e9fcf758ceb0e580b13486f559e8 data/c/tags/item/crystals.json 5a6103dc285601251f184b19e7f86cb36d7b3ce1 data/c/tags/item/nuggets/diamond.json 1baccf8e881d9ee9e58da10b8fa7f6612319d59e data/c/tags/item/rods/steel.json c4cab8d341014b52b18d23f40228474789f6038e data/c/tags/item/plates/stainless_steel.json @@ -318,7 +321,8 @@ aace5d604ac040a13dc7d30a720695235c8dc840 data/c/tags/item/gears/obsidian.json 6758182767f9991b12a9e4d7db28f7f4d88ade1c data/c/tags/item/dirty_dusts/lumium.json 31974ded4c7fb7e3c1f2b01f7aca87227b4cfa03 data/c/tags/item/wires/tin.json d576d226ee1c4726f55571c11470de7cdf8caf9b data/c/tags/item/storage_blocks/dimensional_shard.json -3d6fcef9d85039d4f3b9a4afc29458a504053a25 data/c/tags/item/ores/iridium.json +5144f4f4f6e2b89c53a6d4ad8f54a2d376854ee9 data/c/tags/item/ores/iridium.json +1669565aecd738cf3ba17990dfb12999bae2751c data/c/tags/item/shards/copper.json bac263b71e2cdebd5923fc49c3f4d20f00fc2ea9 data/c/tags/item/clumps/gold.json 03e5c6ecca7154c46e9ef0d05e19325476907ded data/c/tags/item/rods/osmium.json 07079a1d1b5a475271ea6d307d34fac8526c9257 data/c/tags/item/gears/lead.json @@ -333,7 +337,7 @@ c50a29646b70a7204bff04c5b3aabc5768529baa data/c/tags/item/dusts/stainless_steel. ca08ad7a406cdde573caad7157a0a1b3b280620b data/c/tags/item/wires/plutonium.json 2c3e9bff2a7f555cec1aa10ae284c69d661240c2 data/c/tags/item/crystals/brass.json b9582771a3c795908041737ee91bf2de6a364c55 data/c/tags/item/wires/iridium.json -d1fd29fffd2bb7868690fa98004f268d6b0ce3f9 data/c/tags/item/ores/nickel.json +5285fdec54367903fa2bfa7a5fcbf29e360e5e86 data/c/tags/item/ores/nickel.json d3333b513592e5bfcee1a6155389a5422f5a0768 data/c/tags/item/dusts/fluorite.json a5bf3f32102f54480a5e1fd0853f880fd138bdf3 data/c/tags/item/wires/tungsten.json 0647f7966dbc2eb2d52b42cf78fc2ae357f4bb95 data/c/tags/item/gears/graphite.json @@ -371,7 +375,7 @@ d5bf992dffdd6f9bc7cfe19df6b06bc60f2319d3 data/c/tags/item/nuggets/electrum.json 21052df8247075f05c7e76c1f56191c2dfb6fde6 data/c/tags/item/gears/invar.json 3a163fc31de6a844ca8f6fd35469b63b71f78ff7 data/c/tags/item/dusts/electrum.json 8bfd61e77da71662b9519a4ffcaff10d5b7d0463 data/c/tags/item/crystals/platinum.json -2035af66764ecea8e75eb20f47051fe737b5a841 data/c/tags/item/ores/tungsten.json +019aa2792657ad9db4538756c5ce4adef7f3e1b3 data/c/tags/item/ores/tungsten.json eea55a49f24082d210c9faca1a244bbac8b86c1d data/c/tags/item/rods/lead.json 4f99049dead29acb04070df5473a1ea8e81fe5c0 data/c/tags/item/dirty_dusts/quartz.json f066d9b7d1ec0e6a03c2bfcc5d0da471c12c4804 data/c/tags/item/clumps/uranium.json @@ -398,11 +402,11 @@ fffdd562af0d59c4ae33b64902442215de783ee0 data/c/tags/item/storage_blocks/electru 5b8b9b0d35813c0c89e3e7b61104b1029066c7a6 data/c/tags/item/storage_blocks/raw_tungsten.json 4a0a0925527aaf731d622406840ca1a2bd635917 data/c/tags/item/shards/lumium.json fd3a93e1eaab82877cf43a4a1eea09ca15083953 data/c/tags/item/nuggets/tin.json -2650855f9966f4819fd82c2d8881c772e5dcba70 data/c/tags/item/ores/titanium.json +51ecc3e0cf0a398771ab788acda05d9a83e9e1be data/c/tags/item/ores/titanium.json 4521a201013acdebe7bb4887a333c37d02599317 data/c/tags/item/storage_blocks/raw_chromium.json 5325d6eb0cd9344ad69c515e35e9268e23346bfc data/c/tags/item/dusts/copper.json 2f01a1b1239007eeda2dcc2ca9830c7ffac61ce5 data/mekanism/tags/item/shards/platinum.json -e098d68eb6850a9596609349dc9ff73c0f09ef57 data/c/tags/item/dirty_dusts.json +142707871a0c65e9189e7a8a456e756a2a9fbfd4 data/c/tags/item/dirty_dusts.json d264da9210be71ad4761ab99b112ea75509adb93 data/c/tags/item/gems/dimensional_shard.json 75064094fc7e35d84935aa95bbc1db27945a0a0b data/c/tags/item/dirty_dusts/iridium.json e08dbea2502672d95770e9182078dc4a9b93784d data/mekanism/tags/item/shards/aluminum.json @@ -417,7 +421,8 @@ fdee6774108c433cd0e97aa473a20fa4ccd2c854 data/c/tags/item/plates/tin.json d37856c6a733ef4511e9d454b2b90d968c1d542c data/c/tags/item/wires/electrum.json a8ad225a206923dac417b7f3f0fbc1db654441f2 data/c/tags/item/raw_materials/platinum.json c8bc022c864c7f2651610ad0c947c7d18d88e4de data/c/tags/item/ingots/invar.json -396b0d6a7e3f1a28a6531ad8dd3d44c907bcb0be data/c/tags/item/ores.json +124376a372d5d849b2b1ed2e18f0e360b659cd8f data/c/tags/item/clumps/copper.json +f15c58812a926b30ccfd0bf8b98696208e728f2f data/c/tags/item/ores.json 402a9649858ed29e78b90f48fca9b477b43c4090 data/c/tags/item/plates/silicon.json 8b637ef066f7e0414c55c2a3830d648f6991a84b data/c/tags/item/shards/antimony.json f6f7c1ea8cd20dea10c685ab39d17c105e8acb22 data/c/tags/item/ingots/graphite.json @@ -427,8 +432,8 @@ f5df419b2422a394b02dbc8ede180a45dbbac3ee data/c/tags/item/dirty_dusts/titanium.j 2c78b6a416a2dfdeaceb209c5f6f67d7d513f89f data/c/tags/item/plates/titanium.json eda92cef2f735acfe7548e9140f8acfae95b04ee data/c/tags/item/dirty_dusts/platinum.json 7d2a77d73cde4f8ffc46513eeefaf28ef231a46c data/c/tags/item/nuggets/osmium.json -c010247908cce52d8419ee4ae09ab225644b3f91 data/c/tags/item/shards.json -dfb1c98f807d4c77061ecf675396ec71a3b18d43 data/c/tags/item/ores/aluminum.json +0145feed62012de6e2c44b378baeda342a969e67 data/c/tags/item/shards.json +2e4854bcf07f116922a7c16feff90400c91709be data/c/tags/item/ores/aluminum.json 1e0d05d9fd492cb8b019bd680abd9066ef37fea2 data/c/tags/item/storage_blocks/fluorite.json f7767340772da117c26d65188a0f7dbb22e4d797 data/c/tags/item/dusts/monazite.json 58a0ba4144a96fc813785a08df543451b15ee613 data/c/tags/item/dusts/netherite.json @@ -456,7 +461,7 @@ ccbd9ee7bcaa20fa728eae167669283c37b8329a data/c/tags/item/dusts/nickel.json 956da2910dcf12d3f6834266d59bcf48dbeea1cb data/c/tags/item/rods/tungsten.json 3ca810c9e9e8e3dddb15ab172e07071a7728f062 data/c/tags/item/wires/chromium.json eacccb135a06abab435e0759e512ad838a416d27 data/c/tags/item/gears/plutonium.json -060e8e4b726395501a4836cacbf26f8282531398 data/c/tags/item/ores/dimensional_shard.json +d2eddf0f7abac4539b1e8e68c89863a4721ae3d3 data/c/tags/item/ores/dimensional_shard.json e7b3fa4d986e324b437ac6fe6eac0dbfcf8d6dd6 data/c/tags/item/shards/silver.json 1164b41a7e8fcb67c56846b6f16b491da9237f47 data/c/tags/item/dusts/silicon.json 7a112b3556345e80c5d06c8486d05efab1aad6d5 data/c/tags/item/storage_blocks/nickel.json diff --git a/fabric/src/main/generated/.cache/5059c8810f5ddcb87f7ac72efe0424a8544434ca b/fabric/src/main/generated/.cache/5059c8810f5ddcb87f7ac72efe0424a8544434ca index 754f958..69cbd28 100644 --- a/fabric/src/main/generated/.cache/5059c8810f5ddcb87f7ac72efe0424a8544434ca +++ b/fabric/src/main/generated/.cache/5059c8810f5ddcb87f7ac72efe0424a8544434ca @@ -1,4 +1,4 @@ -// 1.21.1 2024-10-20T09:29:55.640828 FTB Resources/Model Definitions +// 1.21.1 2024-10-25T12:55:11.495892 FTB Resources/Model Definitions 3139554f180fd79ee17923b1c1a0681a84dda16f assets/ftbmaterials/blockstates/zinc_nether_ore.json a1570b05cbb611031c01838ca287fdbee628106f assets/ftbmaterials/blockstates/diamond_nether_ore.json c83a78b80a4bb79cfbce72c865b47f817484ef98 assets/ftbmaterials/models/item/platinum_nether_ore.json @@ -11,8 +11,8 @@ b2e9cf780318fa4c185efe77c85737e33c744ddc assets/ftbmaterials/blockstates/sulfur_ ea4576fac316821c62cdfc738b786eeaed953d70 assets/ftbmaterials/models/item/invar_ingot.json 9f8c147a77744fad229ee1383448b026629299b2 assets/ftbmaterials/blockstates/zinc_raw_block.json 76e67ff5e3339752e44f4f4d19a6b9f3482c639a assets/ftbmaterials/models/block/nickel_raw_block.json -294a16fd4fdfce52930109b04f5269a31ebc292f assets/ftbmaterials/blockstates/plutonium_block.json f61c64aeed1564bc9f593d59272dd20d90892408 assets/ftbmaterials/models/item/obsidian_dust.json +294a16fd4fdfce52930109b04f5269a31ebc292f assets/ftbmaterials/blockstates/plutonium_block.json e50f3604018624fb4acd6ae1211e5739bd18c9e9 assets/ftbmaterials/models/item/quartz_deepslate_ore.json 4be67f0fbf601f5aac94874e03c60277aa31f329 assets/ftbmaterials/models/block/bauxite_stone_ore.json 27b709949cd8b453aebd8dd6f16d0c46049c4bb3 assets/ftbmaterials/models/item/lapis_lazuli_nether_ore.json @@ -144,8 +144,8 @@ b8c98d6c0d2263d315869261e2c50c90ef43ec1e assets/ftbmaterials/models/item/sulfur_ 0787d8f2a04ca79c0441f0794671978837462899 assets/ftbmaterials/blockstates/tin_raw_block.json 652ebddc21e725ae53782f1dbd81a83c2f8a0296 assets/ftbmaterials/models/item/tin_wire.json f5004545af50e01924370c04540867bbb12aa1f8 assets/ftbmaterials/models/item/iridium_clump.json -f5f17bbbb1d6c6eb72b208af1231e78751275e22 assets/ftbmaterials/models/item/netherite_gear.json 5029af95a558ef9820c47dda7841732e73ab204a assets/ftbmaterials/models/item/monazite_stone_ore.json +f5f17bbbb1d6c6eb72b208af1231e78751275e22 assets/ftbmaterials/models/item/netherite_gear.json 26cd4de9f942f66a699cc149348d4246030b40ff assets/ftbmaterials/models/block/antimony_block.json 626ff325b1dd7eec5b71a999c0645a9d4b5e8e36 assets/ftbmaterials/models/item/lumium_rod.json 9c5206fcc44f2eca005119935dc9097af5c628c7 assets/ftbmaterials/models/block/fluorite_stone_ore.json @@ -199,6 +199,7 @@ a6d5d5f8fa4c389391e5fa6892fa2b90740b7666 assets/ftbmaterials/blockstates/silver_ 0a2bfa93ec17575938eb826ddc8355ee731fe81a assets/ftbmaterials/models/item/osmium_clump.json 391a4e34360710f36a65f7d16bd780ef0be84d3b assets/ftbmaterials/models/item/platinum_raw_ore.json fb899b04090a54c7bf51455e5dba079058d3128a assets/ftbmaterials/models/block/resonating_ore_stone_ore.json +fcbfe7c373b3daa44cca3c5db9349618696ca9c1 assets/ftbmaterials/models/item/copper_clump.json d90011492da0ad7a36f3e5b0b79d62fed4a2cb9a assets/ftbmaterials/blockstates/dimensional_shard_deepslate_ore.json 0693a2c069fe15ca39670a2ff9b55dd6cf34d712 assets/ftbmaterials/models/item/monazite_end_ore.json ca5818006e11b6cab280f403fe8b223f4cc4efe2 assets/ftbmaterials/models/block/gold_nether_ore.json @@ -265,8 +266,8 @@ f43357234d9c5399e28529eef2887093d8602613 assets/ftbmaterials/blockstates/lead_ne 45ea27c18ad2a8b57cfd2b7c59ed72a92b7305a7 assets/ftbmaterials/models/item/monazite_nether_ore.json 20ffd53c643b907ceb26aa7d0de8c66530c73d6c assets/ftbmaterials/blockstates/silver_stone_ore.json cff8945ab40449c4a255d5ba372c82471382c373 assets/ftbmaterials/blockstates/antimony_nether_ore.json -338d52363dfe546dde149de8154535dbb7952de9 assets/ftbmaterials/models/item/aluminum_deepslate_ore.json 5f259e321cef211e18fec07b3d962854f862c108 assets/ftbmaterials/models/block/uranium_raw_block.json +338d52363dfe546dde149de8154535dbb7952de9 assets/ftbmaterials/models/item/aluminum_deepslate_ore.json f49b603db19b28bbc8b0245b04d2424a87bc64ae assets/ftbmaterials/models/item/lead_deepslate_ore.json 8858642d73c842304df520965956b526ddfaf40f assets/ftbmaterials/blockstates/silver_end_ore.json 50435f3edf3c92c1859f36f0b50ea98ffa2e1603 assets/ftbmaterials/models/item/iridium_nether_ore.json @@ -279,8 +280,8 @@ d57aef833cfa5a38f8f04819fef6cc307f356d9b assets/ftbmaterials/models/item/tungste b4f5c6cb6cf3c93a065346f138b8f27cec650992 assets/ftbmaterials/models/item/zinc_nether_ore.json 27704c4a082fe94657690506d4e9da37975e7d83 assets/ftbmaterials/models/item/aluminum_wire.json 8d5ce8e7cb7f9b6b050427ac82cf0983515c79b8 assets/ftbmaterials/models/item/chromium_raw_ore.json -6a725a3085b7cb1282b04ae402c831f0341f385b assets/ftbmaterials/blockstates/quartz_deepslate_ore.json 5e4b2f81ce589cb0a286c3bd51e1df5cff5fec1f assets/ftbmaterials/blockstates/aluminum_block.json +6a725a3085b7cb1282b04ae402c831f0341f385b assets/ftbmaterials/blockstates/quartz_deepslate_ore.json 85a5182d76700a505d9bc08c3d0cfbcdb4354c51 assets/ftbmaterials/models/item/quartz_rod.json a3abe8fc8b2065658b97e63a9cfb7b27957f9574 assets/ftbmaterials/models/item/antimony_stone_ore.json 322d9ba23eb2ba42e8eb3c7cf9c9288b26dbf970 assets/ftbmaterials/models/block/aluminum_block.json @@ -355,8 +356,8 @@ ee01dbb3a15287194b2b661362cc189c8462e388 assets/ftbmaterials/models/item/iron_wi ff2a1b4002423c6ccad5077c81a0fd205fcfc368 assets/ftbmaterials/models/item/silver_dirty_dust.json a41320e787fbc6632ed16ad632c38441f3a925ab assets/ftbmaterials/models/block/bauxite_end_ore.json e992f91dd453a19016f8182fcf66c88af2287606 assets/ftbmaterials/models/item/osmium_raw_ore.json -e38cb8678ba074c6aabbe29d3ef334e4cc605801 assets/ftbmaterials/models/item/silver_shard.json 44ebb3a410bd3fbdef7fb89551251cddc1ff4772 assets/ftbmaterials/models/item/aluminum_crystal.json +e38cb8678ba074c6aabbe29d3ef334e4cc605801 assets/ftbmaterials/models/item/silver_shard.json 4a6bec02b747a0a537676f7072ebb080d0b741ec assets/ftbmaterials/models/item/constantan_rod.json ceda8faf9f927f3a789aa54305049f412b316265 assets/ftbmaterials/models/item/uranium_block.json 46317c353e19814a0eb612663885daf8e0c5536e assets/ftbmaterials/models/block/silver_raw_block.json @@ -390,8 +391,8 @@ dab5a4f2b422c6737e141b77949846b4e30798d1 assets/ftbmaterials/blockstates/aluminu 162b56496707e678aa50ccf7a5fbfc1eaed20320 assets/ftbmaterials/models/block/uranium_block.json 83b860433389afe3028fc529b181382fbbbfabfb assets/ftbmaterials/models/item/titanium_crystal.json c4030ed466e25a248d25ca19851211b78a4d00af assets/ftbmaterials/models/item/osmium_raw_block.json -d664481a15ad0b0aa9afeacf7590c09aac431f34 assets/ftbmaterials/models/item/diamond_nugget.json 00a8dd03cd61d1337d7c13d9f207b3bf76e5c7e4 assets/ftbmaterials/models/item/platinum_stone_ore.json +d664481a15ad0b0aa9afeacf7590c09aac431f34 assets/ftbmaterials/models/item/diamond_nugget.json 9a7d11f4624cc49827e11410eb4bb03b986d5688 assets/ftbmaterials/models/item/silicon_ingot.json 7657423ef5f13065375f96a1262d8453de27ebad assets/ftbmaterials/blockstates/bauxite_deepslate_ore.json 031ad4fef177846e303bbd847815cb02a5e809de assets/ftbmaterials/models/item/nickel_nether_ore.json @@ -453,6 +454,7 @@ c63f49218532e14f032b9ec25aa5eedac84a818e assets/ftbmaterials/models/item/refined 4060954fa7896074ec9a21929bc33f11b3c27866 assets/ftbmaterials/models/item/zinc_dirty_dust.json 85e2e07fafdd04056eb32787a2380e59f82823ad assets/ftbmaterials/blockstates/antimony_stone_ore.json c6105adb5b8ccd57aa2302520f9b08b2777eaa85 assets/ftbmaterials/blockstates/aluminum_deepslate_ore.json +72a7c6f56f1a6f1127f34860ec5457c50fd9d40d assets/ftbmaterials/models/item/copper_shard.json 8ffe45bb0dc0d8763f80ff2ec58d5f13dc56e826 assets/ftbmaterials/models/block/iron_end_ore.json c57b4093f793b7726fc01152f32e4a96a279da86 assets/ftbmaterials/blockstates/fluorite_block.json fed15c4060a4b23bd924e4d908ce327ed44ea8ea assets/ftbmaterials/models/item/tungsten_clump.json @@ -582,6 +584,7 @@ d79616bb775a7f2b840a14a39f317c6fd8bb124e assets/ftbmaterials/models/block/uraniu 0636f29a24261889f2756ad4542d8a2f0dba7b25 assets/ftbmaterials/models/item/aluminum_stone_ore.json 934dbe07a2d561eb18f9120f0bf73663e08477d0 assets/ftbmaterials/models/item/silver_nugget.json cc6cf3f3f067c5432fe8755760f7e89f0b96bb59 assets/ftbmaterials/models/item/refined_glowstone_ingot.json +3ce7215e389330d24b99a3866b4489afb9df940a assets/ftbmaterials/models/item/copper_dirty_dust.json 6f27994ef59bf06090d5f2892f3973a92ce0011c assets/ftbmaterials/models/item/silicon_nugget.json 8c4bb15f04586b3013a4db1c19a259ff660da853 assets/ftbmaterials/models/block/dimensional_shard_deepslate_ore.json 7047ba4fedf2844ce28ad030294898463779246b assets/ftbmaterials/models/item/graphite_dust.json @@ -647,8 +650,8 @@ d13c0585bff13f499742c823e36f0d30a66f09e4 assets/ftbmaterials/models/item/zinc_en c687a9864c2444acbf3238e855bd5ec3d59556ee assets/ftbmaterials/models/item/plutonium_rod.json 1566c94ffa06a2edbad476d9e7bfef24a7120c4d assets/ftbmaterials/models/item/titanium_dirty_dust.json 3be5febd7ac3e1ccc5ea17077f6d9cd63b837c78 assets/ftbmaterials/models/item/platinum_end_ore.json -c7874d0abfc47355997327bdbd5226acf54b85dd assets/ftbmaterials/models/item/netherite_wire.json 0651f221b8f4221893f6df68b2ab13e727d33a78 assets/ftbmaterials/models/item/uranium_ingot.json +c7874d0abfc47355997327bdbd5226acf54b85dd assets/ftbmaterials/models/item/netherite_wire.json 0deadeadbd4dbea24694a8b4339daf2a72e59047 assets/ftbmaterials/blockstates/plutonium_raw_block.json f67154f28cdc629e1efcaa28544dc13f133b4b47 assets/ftbmaterials/models/block/chromium_block.json 1bd2fbfcb5d013cb7e1f38a4a073f157abe26a19 assets/ftbmaterials/models/block/platinum_end_ore.json @@ -707,16 +710,16 @@ ed848867aa2b80e9afc474bea121cfaf6e3f5b4d assets/ftbmaterials/blockstates/aluminu e4263f83e260889ec31e2ea6416af09684ab8e62 assets/ftbmaterials/models/item/nickel_stone_ore.json 9470d7958bd833d4623178653b344748f9f2dbcf assets/ftbmaterials/models/item/antimony_ingot.json 437167a7159a8772789b92a5e77d1e746f132f5f assets/ftbmaterials/models/item/uranium_end_ore.json -a9666b0c9be434a9053774f7ab9048354bb63847 assets/ftbmaterials/blockstates/lead_end_ore.json 366138bb54d53693af8d403b0b934e4139b729e0 assets/ftbmaterials/models/item/tungsten_nugget.json +a9666b0c9be434a9053774f7ab9048354bb63847 assets/ftbmaterials/blockstates/lead_end_ore.json 8ed22ed8a1cadba15f7b5ab063559559dc7a6ca5 assets/ftbmaterials/models/item/diamond_gear.json a548a6446464094cf1019c9fd05c26515b99d039 assets/ftbmaterials/models/item/lead_dust.json 17b7be09288b253f65c24af778235a5847634e57 assets/ftbmaterials/models/item/dimensional_shard_deepslate_ore.json 737fa676f4e3cc6d3658f1918af3c233472ecbf7 assets/ftbmaterials/models/item/electrum_wire.json 12c0d50fc75fbb40913e925a11a764d5f29c2b6b assets/ftbmaterials/models/item/netherite_rod.json -dc4b07ea1baa794c7b74470a20074d07ab4ea982 assets/ftbmaterials/blockstates/emerald_end_ore.json 25f1edfd170afb1aa90f3364e0c18be6862775bc assets/ftbmaterials/blockstates/quartz_end_ore.json 5ea9c78d5de10232aad4cfdb2f167825cb472efa assets/ftbmaterials/blockstates/fluorite_end_ore.json +dc4b07ea1baa794c7b74470a20074d07ab4ea982 assets/ftbmaterials/blockstates/emerald_end_ore.json 63143c0c8ec0c1bb1703ab356cb5098d31f42542 assets/ftbmaterials/blockstates/tungsten_stone_ore.json 69afe5165e00db3cfc8f0ca3804294b3ee5a6f72 assets/ftbmaterials/models/block/plutonium_block.json 067c7a68c6af248eeed9e33e24d4a5ca15ac4027 assets/ftbmaterials/models/item/nickel_ingot.json @@ -780,5 +783,6 @@ acba013797ae3f09cb5f47fe62ba73b1e1c7a8a1 assets/ftbmaterials/models/item/titaniu ab976485d83b39bba0e6f18d70993e18540eab43 assets/ftbmaterials/models/item/brass_gem.json cc2af4a34e0f6d79aa6248c191febaf988fa11c3 assets/ftbmaterials/models/item/osmium_ingot.json f967d3231bd11255ccb9f7ddd35f46f36cdd3554 assets/ftbmaterials/models/item/silicon_plate.json +c1da88d8e2723ef67b974255586681e89be10cd3 assets/ftbmaterials/models/item/copper_crystal.json 5d9c15b931374b4bb02799bdb4519753028efd06 assets/ftbmaterials/models/item/silver_deepslate_ore.json 1d7805688eac6b3ed9e29e3e04ebdfa28fc9e7a8 assets/ftbmaterials/models/block/lapis_lazuli_end_ore.json diff --git a/fabric/src/main/generated/.cache/9bf786761f354212767db7b8b27e571cfe33f246 b/fabric/src/main/generated/.cache/9bf786761f354212767db7b8b27e571cfe33f246 index 4bd50a1..fde8667 100644 --- a/fabric/src/main/generated/.cache/9bf786761f354212767db7b8b27e571cfe33f246 +++ b/fabric/src/main/generated/.cache/9bf786761f354212767db7b8b27e571cfe33f246 @@ -1,8 +1,10 @@ -// 1.21.1 2024-10-20T09:29:55.637538 FTB Resources/Block Loot Tables +// 1.21.1 2024-10-25T12:55:11.489235 FTB Resources/Block Loot Tables +66024b6bc11aabc50309fac58bfd0699986c85f0 data/ftbmaterials/loot_table/blocks/emerald_nether_ore.json 8a84e33cf17fec09172e997020bcb27f8847f546 data/ftbmaterials/loot_table/blocks/antimony_stone_ore.json 226683dcdab1ce017b5257d520d797bfe3381b1e data/ftbmaterials/loot_table/blocks/tungsten_end_ore.json ca4334341cdefe5f0bf8ee011244284598d0c4cb data/ftbmaterials/loot_table/blocks/tin_raw_block.json 1114b6a7743e16e8e54e0908a639a46fa6545dea data/ftbmaterials/loot_table/blocks/tin_block.json +2b17ca3257792ea781b79ceadb5f130fa97a544b data/ftbmaterials/loot_table/blocks/redstone_nether_ore.json 9c53a63cda772f1499db64ef26c4d90087f04afc data/ftbmaterials/loot_table/blocks/brass_raw_block.json 6ac9b32ec1e76e2da82860854498e1092bbca4ca data/ftbmaterials/loot_table/blocks/tungsten_raw_block.json 42f8d8d710d58e7ec70fe350b67b0f12669485fd data/ftbmaterials/loot_table/blocks/titanium_block.json @@ -15,6 +17,7 @@ a17caa428413260f7612557bb7b54c42708631e4 data/ftbmaterials/loot_table/blocks/sul 4f88c1972564c066e6b56691c35fec4dcb3e083c data/ftbmaterials/loot_table/blocks/silver_raw_block.json d314c305572aefe828a7b5d331aa44cfc122c522 data/ftbmaterials/loot_table/blocks/zinc_block.json f692919329ae63b436faa77897b85bef430a5a64 data/ftbmaterials/loot_table/blocks/tin_end_ore.json +60a84e7927e11a097ffe507d21d4db1513221bf6 data/ftbmaterials/loot_table/blocks/gold_nether_ore.json 990e5d119f0361399142ebe69880ca8e1f6d8325 data/ftbmaterials/loot_table/blocks/uranium_raw_block.json 3b9108cadd9ece0c554d97d46ad18cfde9f9e3c7 data/ftbmaterials/loot_table/blocks/uranium_end_ore.json 5217ede5f92163f181f51dec87b9766aa5a69283 data/ftbmaterials/loot_table/blocks/lumium_block.json @@ -36,8 +39,9 @@ dcedebb8af36fd206903568e6b4b68b785a89192 data/ftbmaterials/loot_table/blocks/nic cd61b3b886c4b3086509556262e1338f09bdb615 data/ftbmaterials/loot_table/blocks/zinc_deepslate_ore.json 3632b5dcb384d9fef6cbe46cca72e9bb6a69e406 data/ftbmaterials/loot_table/blocks/silicon_block.json 9f9c19f18a3db44129ebad75ef9353316ab0ebfb data/ftbmaterials/loot_table/blocks/chromium_raw_block.json -624f0aef12146b17aea6ef0ad50f13c8eda4ea00 data/ftbmaterials/loot_table/blocks/bauxite_block.json +57861a1759f0a38d7b85fff3644feaedc2f99d2f data/ftbmaterials/loot_table/blocks/lapis_lazuli_nether_ore.json afda7174783ea53fd36962aa980c01e85d5a5be3 data/ftbmaterials/loot_table/blocks/tin_deepslate_ore.json +624f0aef12146b17aea6ef0ad50f13c8eda4ea00 data/ftbmaterials/loot_table/blocks/bauxite_block.json ecb77bc5c59251e7827e3da2d9c9ba1a7f7f28f2 data/ftbmaterials/loot_table/blocks/silver_stone_ore.json d7e568b93f6926fb2275df8bb74680625f50a092 data/ftbmaterials/loot_table/blocks/silicon_raw_block.json bdce6d21600a69ed4f95215c5a8f93032e22691d data/ftbmaterials/loot_table/blocks/lead_stone_ore.json @@ -47,22 +51,26 @@ bdce6d21600a69ed4f95215c5a8f93032e22691d data/ftbmaterials/loot_table/blocks/lea 5b0c126d8af6bec3d16ea37a30efe88a220cc4fc data/ftbmaterials/loot_table/blocks/osmium_deepslate_ore.json 1cdcc93505c959f775b0eaab5270ae6ab2d4fdd3 data/ftbmaterials/loot_table/blocks/zinc_nether_ore.json 73d24ab3f0cbdc3b6a7e64092b5cc69825b8423a data/ftbmaterials/loot_table/blocks/lead_raw_block.json +83dc9313447d1119f4a4d5affe5f85da1f476b3b data/ftbmaterials/loot_table/blocks/quartz_end_ore.json e92a0b51518dc91e3a74720a23ba5a6d0f7c1d4a data/ftbmaterials/loot_table/blocks/bronze_block.json 70263b0bfbd02d5175a3b969967a43610d2a7554 data/ftbmaterials/loot_table/blocks/titanium_stone_ore.json 9b412fd89388f4a5ce8cbce48ff75bd37a64d557 data/ftbmaterials/loot_table/blocks/graphite_block.json ec58add7de976b66bfc218bb8719ae4aafc12b28 data/ftbmaterials/loot_table/blocks/invar_block.json +5242fd736fb0b957f4c5954dd6cc34c4162bc4b3 data/ftbmaterials/loot_table/blocks/copper_nether_ore.json 67001ddf4318c3a7bd3cec55919d161c8b0b88be data/ftbmaterials/loot_table/blocks/zinc_raw_block.json c8e9a4f9a34c132a628b078707005e821844dd82 data/ftbmaterials/loot_table/blocks/antimony_block.json aa4d45d3a68b76a6d1c300446f8b7f829885fa87 data/ftbmaterials/loot_table/blocks/silver_end_ore.json 54c17bdbd5f99ddd884c7bad4908e4de2019a1f7 data/ftbmaterials/loot_table/blocks/titanium_end_ore.json 07939d02a849b5605e3e5c5047d215091fe500b1 data/ftbmaterials/loot_table/blocks/silver_deepslate_ore.json 26d04217dcc7c318c2142525b957e9c553605d0e data/ftbmaterials/loot_table/blocks/osmium_nether_ore.json +f5ead92e715e1b054280038adc50298fc112c9a5 data/ftbmaterials/loot_table/blocks/emerald_end_ore.json ca5e41bea58512de789b57b3f9266e9405504d64 data/ftbmaterials/loot_table/blocks/platinum_deepslate_ore.json 8eb1b6d65eafb3a50e8c2fbcb4a9ed6d8965a5e7 data/ftbmaterials/loot_table/blocks/zinc_end_ore.json 1c4a997949a4d2b8cc8eb5a7ac661ee7d2138ba0 data/ftbmaterials/loot_table/blocks/aluminum_stone_ore.json 41f182d1fe7454bdbd0a37552ae888f4d3f78cb3 data/ftbmaterials/loot_table/blocks/aluminum_end_ore.json 12aaf0a05eda2fce61930fc3224f339e347e4676 data/ftbmaterials/loot_table/blocks/osmium_end_ore.json f65e2e7b8d3b3bbabce61948133dcf0aa05658b0 data/ftbmaterials/loot_table/blocks/titanium_raw_block.json +671597d8506c55c3fa3b035ab56c172cb44bccbb data/ftbmaterials/loot_table/blocks/diamond_end_ore.json 831cccac0e6302d150e85a0a56d61683c580808d data/ftbmaterials/loot_table/blocks/nickel_nether_ore.json 40cbd6773ac20c631c1945bd79fe22a6846c938a data/ftbmaterials/loot_table/blocks/nickel_stone_ore.json 85a2c967aff722f1ba7a295c0e7bce6f16db763e data/ftbmaterials/loot_table/blocks/platinum_raw_block.json @@ -71,8 +79,10 @@ de344e5f69e18eaf7a4d179bacfecfa9311a810c data/ftbmaterials/loot_table/blocks/res d66015ffb9345606f5ce8d1179b7cf18bf2609eb data/ftbmaterials/loot_table/blocks/silver_block.json f09b9445c9f2ea3fbf15e34319f90995a37bc3e1 data/ftbmaterials/loot_table/blocks/tungsten_nether_ore.json 3cdeacaf3f0691818719e30f156d094e5e83fb0e data/ftbmaterials/loot_table/blocks/lead_nether_ore.json +2033e2be8014c2f46469872d76b5fd9b9ba45c51 data/ftbmaterials/loot_table/blocks/diamond_nether_ore.json 7aae51669fecebb73d33d875c896346a47db24c1 data/ftbmaterials/loot_table/blocks/silver_nether_ore.json 0890e367240169cb1e0efca103b71f15de63bb1c data/ftbmaterials/loot_table/blocks/antimony_end_ore.json +35f77abc5fc5b30d8cc210c9734d1e5ba606357b data/ftbmaterials/loot_table/blocks/lapis_lazuli_end_ore.json 5e5e312b5a30fd650f4994032e1bcfbc624e05cd data/ftbmaterials/loot_table/blocks/uranium_deepslate_ore.json a42162106e2d36a8b8901b16ca03962ca22256ee data/ftbmaterials/loot_table/blocks/osmium_block.json af00e158e820d32ed3fd4b456f705a04ec9e9455 data/ftbmaterials/loot_table/blocks/tungsten_block.json @@ -80,9 +90,12 @@ af00e158e820d32ed3fd4b456f705a04ec9e9455 data/ftbmaterials/loot_table/blocks/tun 842f5d3862083dfdd8af78d4652b2222a171e5d6 data/ftbmaterials/loot_table/blocks/constantan_block.json b7a4829da40bfb140a2eb1505954a98341adf824 data/ftbmaterials/loot_table/blocks/nickel_raw_block.json fc7f23ba81095c0d00e34e400d745691d3481d05 data/ftbmaterials/loot_table/blocks/aluminum_block.json -2781d62ca15278a9ee11600be55985adafc489bc data/ftbmaterials/loot_table/blocks/brass_block.json +fa45141fb8bb5f9aa9fc0d9031f5eb309a36e074 data/ftbmaterials/loot_table/blocks/iron_nether_ore.json 2ad662e279d255927feca88173759f9e37f47306 data/ftbmaterials/loot_table/blocks/titanium_deepslate_ore.json +2781d62ca15278a9ee11600be55985adafc489bc data/ftbmaterials/loot_table/blocks/brass_block.json dba935ace301efa2e0e6fff37e7ee3befe746d85 data/ftbmaterials/loot_table/blocks/aluminum_deepslate_ore.json +3592ced12d06bf7cc902965ac35bf09f6dd64ba3 data/ftbmaterials/loot_table/blocks/copper_end_ore.json +51a3815fb3c04debdea519f3a147222f5a8ee65f data/ftbmaterials/loot_table/blocks/gold_end_ore.json facafd23b8e405bdf7975244e28dc43faa03bfaa data/ftbmaterials/loot_table/blocks/plutonium_raw_block.json 7f095f947405616167c338d96159307add1f11c0 data/ftbmaterials/loot_table/blocks/tin_stone_ore.json dc8a833ec827ec3fb316a1527b9e40fe734e48bc data/ftbmaterials/loot_table/blocks/iridium_block.json @@ -90,6 +103,7 @@ af93fc6f8c14e430d73c2a467a75a061d3883f67 data/ftbmaterials/loot_table/blocks/iri 49a2ed9655dd667eab9b8e8754789306befa2a4c data/ftbmaterials/loot_table/blocks/tin_nether_ore.json 7216807d5ff03e5fb8da7cc4f7d604eea9b2e93d data/ftbmaterials/loot_table/blocks/plutonium_block.json df95724734ee6733817a7bf46027a02da5ba9ed6 data/ftbmaterials/loot_table/blocks/chromium_block.json +b23ae6da0843a75a374c544e723c0900e1ffddee data/ftbmaterials/loot_table/blocks/iron_end_ore.json 232b813274f0245b47e655dc1845c0f2c5bddad1 data/ftbmaterials/loot_table/blocks/steel_block.json 23cb14f812f2d8a9eb9351d07ba8c5a327881c05 data/ftbmaterials/loot_table/blocks/platinum_block.json 5f217a423121452649adb0195c54a081f0e366e4 data/ftbmaterials/loot_table/blocks/lead_block.json @@ -99,5 +113,6 @@ df95724734ee6733817a7bf46027a02da5ba9ed6 data/ftbmaterials/loot_table/blocks/chr dc984a57e39090c875cc81904e8ecae4cf8c131e data/ftbmaterials/loot_table/blocks/osmium_stone_ore.json fe9b9d5458f482118200034e788abd112642d228 data/ftbmaterials/loot_table/blocks/aluminum_raw_block.json 1df963e9a12a27f09cccd2244a0b80b61a159830 data/ftbmaterials/loot_table/blocks/fluorite_block.json +0f834f8aa7dd87075cee752222171d41bf313de9 data/ftbmaterials/loot_table/blocks/redstone_end_ore.json 0a8204b8ac2b7145278f0db5b5a36cb0a21bbb4a data/ftbmaterials/loot_table/blocks/uranium_nether_ore.json c3c7a14d99710483bea4e236c97d0bda7bc7a19a data/ftbmaterials/loot_table/blocks/tungsten_deepslate_ore.json diff --git a/fabric/src/main/generated/.cache/a47a9e138333f50e097c4082fce7f1018b693e3a b/fabric/src/main/generated/.cache/a47a9e138333f50e097c4082fce7f1018b693e3a index 61282ec..5078ff9 100644 --- a/fabric/src/main/generated/.cache/a47a9e138333f50e097c4082fce7f1018b693e3a +++ b/fabric/src/main/generated/.cache/a47a9e138333f50e097c4082fce7f1018b693e3a @@ -1,2 +1,2 @@ -// 1.21.1 2024-10-20T09:29:55.638224 FTB Resources/Language (en_us) -b0d940dcc9acee06dbe6b6419a8254a0421a91f4 assets/ftbmaterials/lang/en_us.json +// 1.21.1 2024-10-25T12:55:11.493041 FTB Resources/Language (en_us) +f96ee9865c8c0d25e072bd3d95dd79d64ead61b1 assets/ftbmaterials/lang/en_us.json diff --git a/fabric/src/main/generated/.cache/addac0a0a12215bd45b5a22553aa70d2108a80a5 b/fabric/src/main/generated/.cache/addac0a0a12215bd45b5a22553aa70d2108a80a5 index 5481d60..81de70b 100644 --- a/fabric/src/main/generated/.cache/addac0a0a12215bd45b5a22553aa70d2108a80a5 +++ b/fabric/src/main/generated/.cache/addac0a0a12215bd45b5a22553aa70d2108a80a5 @@ -1,4 +1,4 @@ -// 1.21.1 2024-10-20T09:29:55.643793 FTB Resources/Recipes +// 1.21.1 2024-10-25T12:55:11.499065 FTB Resources/Recipes a420c7ead5cc92f582ec07fa4a477d6e8eed0f4f data/ftbmaterials/recipe/platinum_block.json 8c00259b5a13e273b6e6107bc16921877b6568db data/ftbmaterials/advancement/recipes/misc/platinum_nugget.json 34aaabd6bd2066128f97aa84301d4f821c8e8835 data/ftbmaterials/recipe/tungsten_ingot.json @@ -178,8 +178,8 @@ c427cf08033c021d9a250920406e1840c389aad8 data/ftbmaterials/recipe/refined_glowst d05bc1658186f3f6546ae6de3824c9fb82c2e990 data/ftbmaterials/advancement/recipes/misc/graphite_ingot.json f0ba08912f633d89a3afdfe879439f95e3288d2f data/ftbmaterials/recipe/iridium_ingot.json f40f3ba808886a1f06735bba6816fca3ebf12f5e data/ftbmaterials/recipe/brass_raw_ore_from_brass_raw_block.json -a884decb8519d5873448006fd2867edecb00e387 data/ftbmaterials/recipe/uranium_raw_block.json fc70b581e24dc9cd8eda31821a14b6635b7753f5 data/ftbmaterials/advancement/recipes/misc/bronze_nugget.json +a884decb8519d5873448006fd2867edecb00e387 data/ftbmaterials/recipe/uranium_raw_block.json 906a1bcafbba28d57f179235fb1c7d1932cacf7c data/ftbmaterials/advancement/recipes/misc/chromium_block.json 71546cc462d0f2081a97cf221e7ad1c2bbd04d72 data/ftbmaterials/recipe/chromium_ingot_from_chromium_block.json ddc91e93b7c004e17bd15261a8a34e0f48d625ac data/ftbmaterials/advancement/recipes/misc/osmium_ingot_from_blasting_osmium_raw_ore.json @@ -194,8 +194,8 @@ af6026ecd7be99afe4e85d6e1445da959a695028 data/ftbmaterials/advancement/recipes/m 65d6a5ae7e59d44e5a5bebb8d68a4cfd871d03cd data/ftbmaterials/recipe/constantan_ingot_from_constantan_block.json 9f07238d9c10d2eaef66edc3f71775179d0b75c1 data/ftbmaterials/advancement/recipes/misc/chromium_nugget.json c5593a7ad3cbc2ac4fedd89376003175ccc742f6 data/ftbmaterials/recipe/nickel_ingot_from_smelting_nickel_raw_ore.json -237007e7f259def864ae7c876033723243243da1 data/ftbmaterials/recipe/iridium_raw_block.json cedab75c1c997a91a163515610c1ec7ebe5e4360 data/ftbmaterials/recipe/tin_ingot_from_tin_block.json +237007e7f259def864ae7c876033723243243da1 data/ftbmaterials/recipe/iridium_raw_block.json 8b016538f91c86df167772fe398886da23e576f5 data/ftbmaterials/advancement/recipes/misc/tin_ingot_from_smelting_tin_raw_ore.json afc317bcc525be1a5eb321bb5b30997de764b878 data/ftbmaterials/advancement/recipes/misc/graphite_block.json f1cee1a3afcd38d9c788302da2d3f2934af90627 data/ftbmaterials/advancement/recipes/misc/steel_ingot.json @@ -205,8 +205,8 @@ f1cee1a3afcd38d9c788302da2d3f2934af90627 data/ftbmaterials/advancement/recipes/m 1280b07e1f2828bd4821cab8a09bca1bf4147824 data/ftbmaterials/recipe/iridium_ingot_from_blasting_iridium_raw_ore.json 318922ee75f54b030a746c408f554b65e8c5ec8c data/ftbmaterials/advancement/recipes/misc/tin_ingot_from_blasting_tin_raw_ore.json 9a6085c0f74d04288ba3aacf7a1d84c560f9cf5d data/ftbmaterials/recipe/silver_ingot_from_blasting_silver_raw_ore.json -754135ac695f53dc7232b67d9104ac144ea3242f data/ftbmaterials/advancement/recipes/misc/chromium_ingot_from_smelting_chromium_raw_ore.json e13b5838ae02958b9bfa85d36fb627e143da1985 data/ftbmaterials/recipe/brass_ingot_from_blasting_brass_raw_ore.json +754135ac695f53dc7232b67d9104ac144ea3242f data/ftbmaterials/advancement/recipes/misc/chromium_ingot_from_smelting_chromium_raw_ore.json eb2e9e884230ca6474c0dd9cfd202bb4717eed33 data/ftbmaterials/recipe/plutonium_ingot_from_plutonium_block.json 74a2864be62ebd8e718ca3e4b6ec6f7a16a27882 data/ftbmaterials/advancement/recipes/misc/lumium_nugget.json 9c55b734f7e2c10c6883e19f7b99bf726f7f9e99 data/ftbmaterials/advancement/recipes/misc/zinc_ingot.json @@ -218,8 +218,8 @@ d1592d6ca2c929d2ac61ff667d549e4b00e395ab data/ftbmaterials/advancement/recipes/m d2a6c916359bf91c2ca6e666882f50e1d0c5677a data/ftbmaterials/recipe/chromium_block.json 2cc1a045026aec42cf1c1d3fd6388031d600ebcd data/ftbmaterials/advancement/recipes/misc/brass_nugget.json f46bb5e8fcbab3a442ad2860557b53eb7d6c94ff data/ftbmaterials/recipe/aluminum_ingot.json -f1eb4e8af67e8cf1916eb2c56617a33eab9c79af data/ftbmaterials/advancement/recipes/misc/nickel_ingot_from_nickel_block.json 7c17f7b0ac91aba93d3c450b92906ab551b8dd6b data/ftbmaterials/advancement/recipes/misc/invar_ingot_from_invar_block.json +f1eb4e8af67e8cf1916eb2c56617a33eab9c79af data/ftbmaterials/advancement/recipes/misc/nickel_ingot_from_nickel_block.json c63c55e0a59db518b0d15e61650054e950b643b5 data/ftbmaterials/advancement/recipes/misc/nickel_raw_block.json 47109910a5aa473f965c887b45951952e6235962 data/ftbmaterials/advancement/recipes/misc/platinum_ingot_from_platinum_block.json c47d330dbc425b1f46c34839d54e3985eb5ffd2e data/ftbmaterials/recipe/brass_block.json diff --git a/fabric/src/main/generated/.cache/bb55705e4f2f8dfdebdc896fb86ebd24efb0c241 b/fabric/src/main/generated/.cache/bb55705e4f2f8dfdebdc896fb86ebd24efb0c241 index d3d838e..02f6474 100644 --- a/fabric/src/main/generated/.cache/bb55705e4f2f8dfdebdc896fb86ebd24efb0c241 +++ b/fabric/src/main/generated/.cache/bb55705e4f2f8dfdebdc896fb86ebd24efb0c241 @@ -1,4 +1,4 @@ -// 1.21.1 2024-10-20T09:29:55.635992 FTB Resources/Tags for minecraft:block +// 1.21.1 2024-10-25T12:55:11.488154 FTB Resources/Tags for minecraft:block 3b39966013df78996bc819ed999ed4590499c8e5 data/c/tags/block/storage_blocks/raw_silicon.json 1ad274657253d8cd31f3d0fd3f8109d96d7ec555 data/c/tags/block/ores/copper.json 43305d2cd2f9c4d618de67bf0d4cf2a35d2e5451 data/c/tags/block/ores/iron.json @@ -15,24 +15,24 @@ ec94f6b377aa9c8d90df428b994aa3add2a1ec69 data/c/tags/block/storage_blocks/raw_ir 02e0481409f16d6cdc06b268ae7607d4017302ba data/c/tags/block/storage_blocks/constantan.json 7dbc140f1eb504057663654c412b4430b6617772 data/c/tags/block/storage_blocks/lead.json a47e2a3ea553bcf850be784cd4c3c27d81a871fd data/c/tags/block/storage_blocks/titanium.json -2035af66764ecea8e75eb20f47051fe737b5a841 data/c/tags/block/ores/tungsten.json -3d6fcef9d85039d4f3b9a4afc29458a504053a25 data/c/tags/block/ores/iridium.json +019aa2792657ad9db4538756c5ce4adef7f3e1b3 data/c/tags/block/ores/tungsten.json +5144f4f4f6e2b89c53a6d4ad8f54a2d376854ee9 data/c/tags/block/ores/iridium.json d996ed9f29f02c041a295f6c1f392a49e78b5e06 data/c/tags/block/storage_blocks/bauxite.json -c37dc49c21d07e62d5bf40a724f3a791b9b02b9e data/c/tags/block/ores/platinum.json -a90b8a0b41a3de1fb18b7e181b33dd0e19975ef2 data/c/tags/block/ores/resonating_ore.json -dfb1c98f807d4c77061ecf675396ec71a3b18d43 data/c/tags/block/ores/aluminum.json +e665fc2a0742c499b3f9c6bd756d34734a2e0b2a data/c/tags/block/ores/platinum.json +8532c8b1084d702cdaa2a70457e0aea02ea9acbc data/c/tags/block/ores/resonating_ore.json +2e4854bcf07f116922a7c16feff90400c91709be data/c/tags/block/ores/aluminum.json 9b7087fa57e2eb66416e1cd33cab1ea6f1b102fd data/c/tags/block/ores_in_ground/stone.json -db5855f662b29f76c5d25431941c3f204ca42fbe data/c/tags/block/ores/quartz.json +2b0c9ce82aafa0b47b0d456f73a655199cdbfba7 data/c/tags/block/ores/quartz.json 4981e37dce5d564f4e1b1b0855f921b43cd06f82 data/c/tags/block/storage_blocks/raw_lead.json 1e0d05d9fd492cb8b019bd680abd9066ef37fea2 data/c/tags/block/storage_blocks/fluorite.json -23254724651061fe203d9b1ab434f9c0b1f63ba9 data/c/tags/block/ores/monazite.json +f6cf298c5d81bd756d126c73bb6456e10e8ca8f2 data/c/tags/block/ores/monazite.json ed9b280f04cf6af741ae84dee7987beaf1bd09df data/c/tags/block/storage_blocks/raw_antimony.json -4106c4d5e91db27b1dc693b995a675376d419858 data/c/tags/block/ores/gold.json 7a112b3556345e80c5d06c8486d05efab1aad6d5 data/c/tags/block/storage_blocks/nickel.json -8933f47de58aac7068bfa1083bd04830c437e2ff data/c/tags/block/ores/zinc.json +4106c4d5e91db27b1dc693b995a675376d419858 data/c/tags/block/ores/gold.json 007d566c61a2b62c6f31dd6e952c57bdfdf2513b data/c/tags/block/storage_blocks/resonating_ore.json +cbb30e2b1eecdd98baf552f5568652e225f541cb data/c/tags/block/ores/zinc.json 1cb6eb263027f0653ba42a4d74597fa0bc160caa data/c/tags/block/storage_blocks/lumium.json -d1fd29fffd2bb7868690fa98004f268d6b0ce3f9 data/c/tags/block/ores/nickel.json +5285fdec54367903fa2bfa7a5fcbf29e360e5e86 data/c/tags/block/ores/nickel.json 019e108e1d11b3eafea71d760f1b340f2d441cac data/c/tags/block/ores/emerald.json 1abd151cda0a9a0ce63c4521acd656ea4db9ba77 data/c/tags/block/storage_blocks/apatite.json 96e09948cb97766e9b82a1a198b51da7ce0df950 data/c/tags/block/storage_blocks/iridium.json @@ -41,48 +41,48 @@ d1fd29fffd2bb7868690fa98004f268d6b0ce3f9 data/c/tags/block/ores/nickel.json bd7f96f85380d4907fb79925cfa0544a45372c8b data/c/tags/block/storage_blocks/silver.json e2cc46529231fbbef908561ff4891114d4a1d196 data/c/tags/block/storage_blocks/raw_aluminum.json f7c6dd9794ddea02c6a63c50dfd6dc4659ce5357 data/c/tags/block/storage_blocks/uranium.json -d008bbf6a3110879e231ed7e3f51a59b7802986b data/c/tags/block/ores/fluorite.json +a054754124f25351e7c7c852ab34df687abb422e data/c/tags/block/ores/fluorite.json ddc4be921326e32adcd70ae8bbb1a7545794e69a data/c/tags/block/storage_blocks/invar.json b44e4c21a58b47ac7facd3afc0dbbb25411a8d05 data/c/tags/block/storage_blocks/aluminum.json 7b64fcd5bd02e4f15529970b7a8f8f00130bbd72 data/c/tags/block/ores_in_ground/end.json 4bc38dfdee3020f108af38de4f5af488d69109d2 data/c/tags/block/storage_blocks/raw_platinum.json -2650855f9966f4819fd82c2d8881c772e5dcba70 data/c/tags/block/ores/titanium.json -84fe8dfe2d1c38b66ccad929723fec9b61c531ba data/c/tags/block/ores/antimony.json +51ecc3e0cf0a398771ab788acda05d9a83e9e1be data/c/tags/block/ores/titanium.json +9254ada52d1a5b2109ecba81ceee405c603edcac data/c/tags/block/ores/antimony.json 0937ef886c5ab17d71b02bdc146dedbe48d250ba data/c/tags/block/storage_blocks/raw_nickel.json 5b0a37722b88f36001decfe1a618e7adabc2aaeb data/c/tags/block/storage_blocks/stainless_steel.json 92f5da32d4e797575c923c0bdc06f4d07c2dbdbc data/c/tags/block/storage_blocks/plutonium.json -396b0d6a7e3f1a28a6531ad8dd3d44c907bcb0be data/c/tags/block/ores.json -c37b7cadb30ae92ebbc56dc903cf026af17590f4 data/c/tags/block/ores/lead.json -749023d5c3df64b389d4142966bb9b46f9af5454 data/c/tags/block/ores/silver.json +f15c58812a926b30ccfd0bf8b98696208e728f2f data/c/tags/block/ores.json +acc6e14f075ba65c115ed522a12882105a792128 data/c/tags/block/ores/lead.json +f5ffe29cb43e3a190c69ca81b5783f95686553d5 data/c/tags/block/ores/silver.json 53c0aff6be4118993d120b26bef10e5c905b87d1 data/c/tags/block/storage_blocks/raw_plutonium.json -f42326220099d79a2c3991a03cafab9b2932bbdf data/c/tags/block/ores/uranium.json +fd328ebe6cf768a4c9a0f88a084c295d1b7e9c33 data/c/tags/block/ores/uranium.json 5922af1c74932024bfc6373cc3a1674aedff5b3f data/c/tags/block/storage_blocks/platinum.json 56dbbaa773ae0ca828c197eaaa974fe04484b236 data/c/tags/block/storage_blocks/raw_uranium.json 2499b0c6dcbbab9c4a8baeefc9693abeeb9b9a12 data/c/tags/block/storage_blocks/raw_zinc.json -bf03dd4d6d155b4ad2be3e999a922da706569a3a data/minecraft/tags/block/needs_stone_tool.json -12b366df6f9639a1e9a48f25602d970a1ace74d9 data/minecraft/tags/block/mineable/pickaxe.json +072bb16909b996d054e7fc4b876893a3b8dcf8ce data/minecraft/tags/block/needs_stone_tool.json +049384c5ea936487d3cc6a1007199e432fa65800 data/minecraft/tags/block/mineable/pickaxe.json 03b93a4b3c249635fe43f0decac09a52a451db0e data/c/tags/block/storage_blocks/raw_silver.json 88ba033da69c8bc03db69763dc767f3ada728764 data/c/tags/block/ores_in_ground/nether.json 7a72a575134265f4374ec74ae19fb6eab7e928b0 data/c/tags/block/ores/redstone.json fffdd562af0d59c4ae33b64902442215de783ee0 data/c/tags/block/storage_blocks/electrum.json cd40a08fb224e0adfcdb08bc731039de82b78771 data/c/tags/block/storage_blocks/osmium.json -fd57e19cc1f2a237f77476a65cb30867f5a50f0e data/c/tags/block/ores/sulfur.json +58f94ab247a3554d21098266ef6c6ee030e4b6cc data/c/tags/block/ores/sulfur.json 3fd5d4bec6d6cd8b1d84ed9a6247886a7d050186 data/c/tags/block/ores/lapis_lazuli.json 3da7c4b46670056b37af2a408d3ec12f72b19666 data/c/tags/block/storage_blocks/chromium.json -fdcf0e4352189021a249a1e4f3f30c7abf660ce6 data/c/tags/block/ores/osmium.json +6893f1807665471fa4afaf9527a09589ec054df1 data/c/tags/block/ores/osmium.json a5404daec7f9dda0b70594a0a19d73255cacd4ed data/c/tags/block/storage_blocks/sulfur.json 823dfcc5e3e9ac6aacfd01987e28c300de8d15ee data/c/tags/block/storage_blocks/graphite.json +5046e7f7eb7d2a147e5b319f89938273f477d1f0 data/minecraft/tags/block/needs_iron_tool.json dcf5a1681a0018b104e3f1c120e8fe972fe30082 data/c/tags/block/storage_blocks/steel.json -d4a39f058e491b5281b10cfa0396a21c922d8ac1 data/minecraft/tags/block/needs_iron_tool.json -eb3c6ee1d93db2cdea78cae95e4accb468286218 data/c/tags/block/ores/bauxite.json 9e7b338251b780356b19afae45c83d2b0a2112e5 data/c/tags/block/storage_blocks/brass.json +f4fb764bae7bd91db1f1898b3aab0c14f69924d9 data/c/tags/block/ores/bauxite.json e497cd9919b1b2f99704adef1aaae59f0ca43d11 data/c/tags/block/storage_blocks/antimony.json e3bfd731ebd7a52267a84d5a56f4d729cf1637e8 data/c/tags/block/storage_blocks/refined_glowstone.json -1cb6a3ae30213ab789d7d7b8d99a315a7a441de7 data/c/tags/block/storage_blocks.json -c34c6675b1ddc340270c1d5bd8b43733d6cddf1a data/c/tags/block/ores/tin.json +7044f7ccc21cbcd52d2b173f599701fec147d05c data/c/tags/block/storage_blocks.json +2dc4355775ae68174fec46ab2aa014d4b5198c90 data/c/tags/block/ores/tin.json e05a99c09be314d20a8f211f890132c27a0d97f3 data/c/tags/block/storage_blocks/bronze.json 5efcdb8374c2dbb55df689b9ae58ebfeec2f0f6a data/c/tags/block/storage_blocks/tungsten.json -12b366df6f9639a1e9a48f25602d970a1ace74d9 data/minecraft/tags/block/incorrect_for_wooden_tool.json +049384c5ea936487d3cc6a1007199e432fa65800 data/minecraft/tags/block/incorrect_for_wooden_tool.json 6c7b84546c414ded3a3036e22de2b5b049b14179 data/c/tags/block/storage_blocks/monazite.json -060e8e4b726395501a4836cacbf26f8282531398 data/c/tags/block/ores/dimensional_shard.json +d2eddf0f7abac4539b1e8e68c89863a4721ae3d3 data/c/tags/block/ores/dimensional_shard.json 576b191d721e27aa998c4ff40fce506a4df87fe4 data/c/tags/block/ores_in_ground/deepslate.json diff --git a/fabric/src/main/generated/assets/ftbmaterials/lang/en_us.json b/fabric/src/main/generated/assets/ftbmaterials/lang/en_us.json index c020ed9..6e38126 100644 --- a/fabric/src/main/generated/assets/ftbmaterials/lang/en_us.json +++ b/fabric/src/main/generated/assets/ftbmaterials/lang/en_us.json @@ -237,10 +237,14 @@ "item.ftbmaterials.constantan_rod": "Constantan Rod", "item.ftbmaterials.constantan_wire": "Constantan Wire", "item.ftbmaterials.copper_blade": "Copper Blade", + "item.ftbmaterials.copper_clump": "Copper Clump", + "item.ftbmaterials.copper_crystal": "Copper Crystal", + "item.ftbmaterials.copper_dirty_dust": "Copper Dirty Dust", "item.ftbmaterials.copper_dust": "Copper Dust", "item.ftbmaterials.copper_end_ore": "Endstone Copper Ore", "item.ftbmaterials.copper_nether_ore": "Nether Copper Ore", "item.ftbmaterials.copper_nugget": "Copper Nugget", + "item.ftbmaterials.copper_shard": "Copper Shard", "item.ftbmaterials.copper_wire": "Copper Wire", "item.ftbmaterials.diamond_clump": "Diamond Clump", "item.ftbmaterials.diamond_crystal": "Diamond Crystal", diff --git a/fabric/src/main/generated/assets/ftbmaterials/models/item/copper_clump.json b/fabric/src/main/generated/assets/ftbmaterials/models/item/copper_clump.json new file mode 100644 index 0000000..aea9c6f --- /dev/null +++ b/fabric/src/main/generated/assets/ftbmaterials/models/item/copper_clump.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ftbmaterials:item/copper_clump" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/ftbmaterials/models/item/copper_crystal.json b/fabric/src/main/generated/assets/ftbmaterials/models/item/copper_crystal.json new file mode 100644 index 0000000..959dced --- /dev/null +++ b/fabric/src/main/generated/assets/ftbmaterials/models/item/copper_crystal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ftbmaterials:item/copper_crystal" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/ftbmaterials/models/item/copper_dirty_dust.json b/fabric/src/main/generated/assets/ftbmaterials/models/item/copper_dirty_dust.json new file mode 100644 index 0000000..1280589 --- /dev/null +++ b/fabric/src/main/generated/assets/ftbmaterials/models/item/copper_dirty_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ftbmaterials:item/copper_dirty_dust" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/ftbmaterials/models/item/copper_shard.json b/fabric/src/main/generated/assets/ftbmaterials/models/item/copper_shard.json new file mode 100644 index 0000000..f19475e --- /dev/null +++ b/fabric/src/main/generated/assets/ftbmaterials/models/item/copper_shard.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ftbmaterials:item/copper_shard" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/block/ores.json b/fabric/src/main/generated/data/c/tags/block/ores.json index 35db410..bdbdc1f 100644 --- a/fabric/src/main/generated/data/c/tags/block/ores.json +++ b/fabric/src/main/generated/data/c/tags/block/ores.json @@ -2,12 +2,12 @@ "values": [ "ftbmaterials:aluminum_deepslate_ore", "ftbmaterials:aluminum_deepslate_ore", - "ftbmaterials:aluminum_stone_ore", - "ftbmaterials:aluminum_stone_ore", "ftbmaterials:aluminum_end_ore", "ftbmaterials:aluminum_end_ore", "ftbmaterials:aluminum_nether_ore", "ftbmaterials:aluminum_nether_ore", + "ftbmaterials:aluminum_stone_ore", + "ftbmaterials:aluminum_stone_ore", "ftbmaterials:copper_end_ore", "ftbmaterials:copper_end_ore", "ftbmaterials:copper_nether_ore", @@ -26,86 +26,86 @@ "ftbmaterials:iron_nether_ore", "ftbmaterials:lead_deepslate_ore", "ftbmaterials:lead_deepslate_ore", - "ftbmaterials:lead_stone_ore", - "ftbmaterials:lead_stone_ore", "ftbmaterials:lead_end_ore", "ftbmaterials:lead_end_ore", "ftbmaterials:lead_nether_ore", "ftbmaterials:lead_nether_ore", + "ftbmaterials:lead_stone_ore", + "ftbmaterials:lead_stone_ore", "ftbmaterials:nickel_deepslate_ore", "ftbmaterials:nickel_deepslate_ore", - "ftbmaterials:nickel_stone_ore", - "ftbmaterials:nickel_stone_ore", "ftbmaterials:nickel_end_ore", "ftbmaterials:nickel_end_ore", "ftbmaterials:nickel_nether_ore", "ftbmaterials:nickel_nether_ore", + "ftbmaterials:nickel_stone_ore", + "ftbmaterials:nickel_stone_ore", "ftbmaterials:osmium_deepslate_ore", "ftbmaterials:osmium_deepslate_ore", - "ftbmaterials:osmium_stone_ore", - "ftbmaterials:osmium_stone_ore", "ftbmaterials:osmium_end_ore", "ftbmaterials:osmium_end_ore", "ftbmaterials:osmium_nether_ore", "ftbmaterials:osmium_nether_ore", - "ftbmaterials:quartz_end_ore", - "ftbmaterials:quartz_end_ore", + "ftbmaterials:osmium_stone_ore", + "ftbmaterials:osmium_stone_ore", "ftbmaterials:quartz_deepslate_ore", "ftbmaterials:quartz_deepslate_ore", + "ftbmaterials:quartz_end_ore", + "ftbmaterials:quartz_end_ore", "ftbmaterials:quartz_stone_ore", "ftbmaterials:quartz_stone_ore", "ftbmaterials:silver_deepslate_ore", "ftbmaterials:silver_deepslate_ore", - "ftbmaterials:silver_stone_ore", - "ftbmaterials:silver_stone_ore", "ftbmaterials:silver_end_ore", "ftbmaterials:silver_end_ore", "ftbmaterials:silver_nether_ore", "ftbmaterials:silver_nether_ore", - "ftbmaterials:sulfur_end_ore", - "ftbmaterials:sulfur_end_ore", + "ftbmaterials:silver_stone_ore", + "ftbmaterials:silver_stone_ore", "ftbmaterials:sulfur_deepslate_ore", "ftbmaterials:sulfur_deepslate_ore", - "ftbmaterials:sulfur_stone_ore", - "ftbmaterials:sulfur_stone_ore", + "ftbmaterials:sulfur_end_ore", + "ftbmaterials:sulfur_end_ore", "ftbmaterials:sulfur_nether_ore", "ftbmaterials:sulfur_nether_ore", + "ftbmaterials:sulfur_stone_ore", + "ftbmaterials:sulfur_stone_ore", "ftbmaterials:tin_deepslate_ore", "ftbmaterials:tin_deepslate_ore", - "ftbmaterials:tin_stone_ore", - "ftbmaterials:tin_stone_ore", "ftbmaterials:tin_end_ore", "ftbmaterials:tin_end_ore", "ftbmaterials:tin_nether_ore", "ftbmaterials:tin_nether_ore", + "ftbmaterials:tin_stone_ore", + "ftbmaterials:tin_stone_ore", "ftbmaterials:uranium_deepslate_ore", "ftbmaterials:uranium_deepslate_ore", - "ftbmaterials:uranium_stone_ore", - "ftbmaterials:uranium_stone_ore", "ftbmaterials:uranium_end_ore", "ftbmaterials:uranium_end_ore", "ftbmaterials:uranium_nether_ore", "ftbmaterials:uranium_nether_ore", + "ftbmaterials:uranium_stone_ore", + "ftbmaterials:uranium_stone_ore", "ftbmaterials:zinc_deepslate_ore", "ftbmaterials:zinc_deepslate_ore", - "ftbmaterials:zinc_stone_ore", - "ftbmaterials:zinc_stone_ore", "ftbmaterials:zinc_end_ore", "ftbmaterials:zinc_end_ore", "ftbmaterials:zinc_nether_ore", "ftbmaterials:zinc_nether_ore", + "ftbmaterials:zinc_stone_ore", + "ftbmaterials:zinc_stone_ore", "ftbmaterials:redstone_end_ore", "ftbmaterials:redstone_end_ore", "ftbmaterials:redstone_nether_ore", "ftbmaterials:redstone_nether_ore", - "ftbmaterials:fluorite_end_ore", - "ftbmaterials:fluorite_end_ore", "ftbmaterials:fluorite_deepslate_ore", "ftbmaterials:fluorite_deepslate_ore", - "ftbmaterials:fluorite_stone_ore", - "ftbmaterials:fluorite_stone_ore", + "ftbmaterials:fluorite_end_ore", + "ftbmaterials:fluorite_end_ore", "ftbmaterials:fluorite_nether_ore", "ftbmaterials:fluorite_nether_ore", + "ftbmaterials:fluorite_stone_ore", + "ftbmaterials:fluorite_stone_ore", "ftbmaterials:emerald_end_ore", "ftbmaterials:emerald_end_ore", "ftbmaterials:emerald_nether_ore", @@ -114,77 +114,77 @@ "ftbmaterials:lapis_lazuli_end_ore", "ftbmaterials:lapis_lazuli_nether_ore", "ftbmaterials:lapis_lazuli_nether_ore", - "ftbmaterials:resonating_ore_end_ore", - "ftbmaterials:resonating_ore_end_ore", "ftbmaterials:resonating_ore_deepslate_ore", "ftbmaterials:resonating_ore_deepslate_ore", - "ftbmaterials:resonating_ore_stone_ore", - "ftbmaterials:resonating_ore_stone_ore", + "ftbmaterials:resonating_ore_end_ore", + "ftbmaterials:resonating_ore_end_ore", "ftbmaterials:resonating_ore_nether_ore", "ftbmaterials:resonating_ore_nether_ore", - "ftbmaterials:dimensional_shard_end_ore", - "ftbmaterials:dimensional_shard_end_ore", + "ftbmaterials:resonating_ore_stone_ore", + "ftbmaterials:resonating_ore_stone_ore", "ftbmaterials:dimensional_shard_deepslate_ore", "ftbmaterials:dimensional_shard_deepslate_ore", - "ftbmaterials:dimensional_shard_stone_ore", - "ftbmaterials:dimensional_shard_stone_ore", + "ftbmaterials:dimensional_shard_end_ore", + "ftbmaterials:dimensional_shard_end_ore", "ftbmaterials:dimensional_shard_nether_ore", "ftbmaterials:dimensional_shard_nether_ore", + "ftbmaterials:dimensional_shard_stone_ore", + "ftbmaterials:dimensional_shard_stone_ore", "ftbmaterials:antimony_deepslate_ore", "ftbmaterials:antimony_deepslate_ore", - "ftbmaterials:antimony_stone_ore", - "ftbmaterials:antimony_stone_ore", "ftbmaterials:antimony_end_ore", "ftbmaterials:antimony_end_ore", "ftbmaterials:antimony_nether_ore", "ftbmaterials:antimony_nether_ore", - "ftbmaterials:bauxite_end_ore", - "ftbmaterials:bauxite_end_ore", + "ftbmaterials:antimony_stone_ore", + "ftbmaterials:antimony_stone_ore", "ftbmaterials:bauxite_deepslate_ore", "ftbmaterials:bauxite_deepslate_ore", - "ftbmaterials:bauxite_stone_ore", - "ftbmaterials:bauxite_stone_ore", + "ftbmaterials:bauxite_end_ore", + "ftbmaterials:bauxite_end_ore", "ftbmaterials:bauxite_nether_ore", "ftbmaterials:bauxite_nether_ore", + "ftbmaterials:bauxite_stone_ore", + "ftbmaterials:bauxite_stone_ore", "ftbmaterials:iridium_deepslate_ore", "ftbmaterials:iridium_deepslate_ore", - "ftbmaterials:iridium_stone_ore", - "ftbmaterials:iridium_stone_ore", "ftbmaterials:iridium_end_ore", "ftbmaterials:iridium_end_ore", "ftbmaterials:iridium_nether_ore", "ftbmaterials:iridium_nether_ore", - "ftbmaterials:monazite_end_ore", - "ftbmaterials:monazite_end_ore", + "ftbmaterials:iridium_stone_ore", + "ftbmaterials:iridium_stone_ore", "ftbmaterials:monazite_deepslate_ore", "ftbmaterials:monazite_deepslate_ore", - "ftbmaterials:monazite_stone_ore", - "ftbmaterials:monazite_stone_ore", + "ftbmaterials:monazite_end_ore", + "ftbmaterials:monazite_end_ore", "ftbmaterials:monazite_nether_ore", "ftbmaterials:monazite_nether_ore", + "ftbmaterials:monazite_stone_ore", + "ftbmaterials:monazite_stone_ore", "ftbmaterials:tungsten_deepslate_ore", "ftbmaterials:tungsten_deepslate_ore", - "ftbmaterials:tungsten_stone_ore", - "ftbmaterials:tungsten_stone_ore", "ftbmaterials:tungsten_end_ore", "ftbmaterials:tungsten_end_ore", "ftbmaterials:tungsten_nether_ore", "ftbmaterials:tungsten_nether_ore", + "ftbmaterials:tungsten_stone_ore", + "ftbmaterials:tungsten_stone_ore", "ftbmaterials:titanium_deepslate_ore", "ftbmaterials:titanium_deepslate_ore", - "ftbmaterials:titanium_stone_ore", - "ftbmaterials:titanium_stone_ore", "ftbmaterials:titanium_end_ore", "ftbmaterials:titanium_end_ore", "ftbmaterials:titanium_nether_ore", "ftbmaterials:titanium_nether_ore", + "ftbmaterials:titanium_stone_ore", + "ftbmaterials:titanium_stone_ore", "ftbmaterials:platinum_deepslate_ore", "ftbmaterials:platinum_deepslate_ore", - "ftbmaterials:platinum_stone_ore", - "ftbmaterials:platinum_stone_ore", "ftbmaterials:platinum_end_ore", "ftbmaterials:platinum_end_ore", "ftbmaterials:platinum_nether_ore", - "ftbmaterials:platinum_nether_ore" + "ftbmaterials:platinum_nether_ore", + "ftbmaterials:platinum_stone_ore", + "ftbmaterials:platinum_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/block/ores/aluminum.json b/fabric/src/main/generated/data/c/tags/block/ores/aluminum.json index ad51549..3d30c92 100644 --- a/fabric/src/main/generated/data/c/tags/block/ores/aluminum.json +++ b/fabric/src/main/generated/data/c/tags/block/ores/aluminum.json @@ -1,8 +1,8 @@ { "values": [ "ftbmaterials:aluminum_deepslate_ore", - "ftbmaterials:aluminum_stone_ore", "ftbmaterials:aluminum_end_ore", - "ftbmaterials:aluminum_nether_ore" + "ftbmaterials:aluminum_nether_ore", + "ftbmaterials:aluminum_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/block/ores/antimony.json b/fabric/src/main/generated/data/c/tags/block/ores/antimony.json index 42857c6..46715ef 100644 --- a/fabric/src/main/generated/data/c/tags/block/ores/antimony.json +++ b/fabric/src/main/generated/data/c/tags/block/ores/antimony.json @@ -1,8 +1,8 @@ { "values": [ "ftbmaterials:antimony_deepslate_ore", - "ftbmaterials:antimony_stone_ore", "ftbmaterials:antimony_end_ore", - "ftbmaterials:antimony_nether_ore" + "ftbmaterials:antimony_nether_ore", + "ftbmaterials:antimony_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/block/ores/bauxite.json b/fabric/src/main/generated/data/c/tags/block/ores/bauxite.json index 015246e..d1985c2 100644 --- a/fabric/src/main/generated/data/c/tags/block/ores/bauxite.json +++ b/fabric/src/main/generated/data/c/tags/block/ores/bauxite.json @@ -1,8 +1,8 @@ { "values": [ - "ftbmaterials:bauxite_end_ore", "ftbmaterials:bauxite_deepslate_ore", - "ftbmaterials:bauxite_stone_ore", - "ftbmaterials:bauxite_nether_ore" + "ftbmaterials:bauxite_end_ore", + "ftbmaterials:bauxite_nether_ore", + "ftbmaterials:bauxite_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/block/ores/dimensional_shard.json b/fabric/src/main/generated/data/c/tags/block/ores/dimensional_shard.json index 0a2dbfb..00a7a78 100644 --- a/fabric/src/main/generated/data/c/tags/block/ores/dimensional_shard.json +++ b/fabric/src/main/generated/data/c/tags/block/ores/dimensional_shard.json @@ -1,8 +1,8 @@ { "values": [ - "ftbmaterials:dimensional_shard_end_ore", "ftbmaterials:dimensional_shard_deepslate_ore", - "ftbmaterials:dimensional_shard_stone_ore", - "ftbmaterials:dimensional_shard_nether_ore" + "ftbmaterials:dimensional_shard_end_ore", + "ftbmaterials:dimensional_shard_nether_ore", + "ftbmaterials:dimensional_shard_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/block/ores/fluorite.json b/fabric/src/main/generated/data/c/tags/block/ores/fluorite.json index b1bf451..3633339 100644 --- a/fabric/src/main/generated/data/c/tags/block/ores/fluorite.json +++ b/fabric/src/main/generated/data/c/tags/block/ores/fluorite.json @@ -1,8 +1,8 @@ { "values": [ - "ftbmaterials:fluorite_end_ore", "ftbmaterials:fluorite_deepslate_ore", - "ftbmaterials:fluorite_stone_ore", - "ftbmaterials:fluorite_nether_ore" + "ftbmaterials:fluorite_end_ore", + "ftbmaterials:fluorite_nether_ore", + "ftbmaterials:fluorite_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/block/ores/iridium.json b/fabric/src/main/generated/data/c/tags/block/ores/iridium.json index 517905a..5a8fb00 100644 --- a/fabric/src/main/generated/data/c/tags/block/ores/iridium.json +++ b/fabric/src/main/generated/data/c/tags/block/ores/iridium.json @@ -1,8 +1,8 @@ { "values": [ "ftbmaterials:iridium_deepslate_ore", - "ftbmaterials:iridium_stone_ore", "ftbmaterials:iridium_end_ore", - "ftbmaterials:iridium_nether_ore" + "ftbmaterials:iridium_nether_ore", + "ftbmaterials:iridium_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/block/ores/lead.json b/fabric/src/main/generated/data/c/tags/block/ores/lead.json index f3ae24b..f437f0b 100644 --- a/fabric/src/main/generated/data/c/tags/block/ores/lead.json +++ b/fabric/src/main/generated/data/c/tags/block/ores/lead.json @@ -1,8 +1,8 @@ { "values": [ "ftbmaterials:lead_deepslate_ore", - "ftbmaterials:lead_stone_ore", "ftbmaterials:lead_end_ore", - "ftbmaterials:lead_nether_ore" + "ftbmaterials:lead_nether_ore", + "ftbmaterials:lead_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/block/ores/monazite.json b/fabric/src/main/generated/data/c/tags/block/ores/monazite.json index 5f46665..53052ac 100644 --- a/fabric/src/main/generated/data/c/tags/block/ores/monazite.json +++ b/fabric/src/main/generated/data/c/tags/block/ores/monazite.json @@ -1,8 +1,8 @@ { "values": [ - "ftbmaterials:monazite_end_ore", "ftbmaterials:monazite_deepslate_ore", - "ftbmaterials:monazite_stone_ore", - "ftbmaterials:monazite_nether_ore" + "ftbmaterials:monazite_end_ore", + "ftbmaterials:monazite_nether_ore", + "ftbmaterials:monazite_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/block/ores/nickel.json b/fabric/src/main/generated/data/c/tags/block/ores/nickel.json index 0a778bd..6d58015 100644 --- a/fabric/src/main/generated/data/c/tags/block/ores/nickel.json +++ b/fabric/src/main/generated/data/c/tags/block/ores/nickel.json @@ -1,8 +1,8 @@ { "values": [ "ftbmaterials:nickel_deepslate_ore", - "ftbmaterials:nickel_stone_ore", "ftbmaterials:nickel_end_ore", - "ftbmaterials:nickel_nether_ore" + "ftbmaterials:nickel_nether_ore", + "ftbmaterials:nickel_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/block/ores/osmium.json b/fabric/src/main/generated/data/c/tags/block/ores/osmium.json index 39d8778..768a73e 100644 --- a/fabric/src/main/generated/data/c/tags/block/ores/osmium.json +++ b/fabric/src/main/generated/data/c/tags/block/ores/osmium.json @@ -1,8 +1,8 @@ { "values": [ "ftbmaterials:osmium_deepslate_ore", - "ftbmaterials:osmium_stone_ore", "ftbmaterials:osmium_end_ore", - "ftbmaterials:osmium_nether_ore" + "ftbmaterials:osmium_nether_ore", + "ftbmaterials:osmium_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/block/ores/platinum.json b/fabric/src/main/generated/data/c/tags/block/ores/platinum.json index a7aa4d6..7dcfa4e 100644 --- a/fabric/src/main/generated/data/c/tags/block/ores/platinum.json +++ b/fabric/src/main/generated/data/c/tags/block/ores/platinum.json @@ -1,8 +1,8 @@ { "values": [ "ftbmaterials:platinum_deepslate_ore", - "ftbmaterials:platinum_stone_ore", "ftbmaterials:platinum_end_ore", - "ftbmaterials:platinum_nether_ore" + "ftbmaterials:platinum_nether_ore", + "ftbmaterials:platinum_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/block/ores/quartz.json b/fabric/src/main/generated/data/c/tags/block/ores/quartz.json index 2c1a692..3b6bdb7 100644 --- a/fabric/src/main/generated/data/c/tags/block/ores/quartz.json +++ b/fabric/src/main/generated/data/c/tags/block/ores/quartz.json @@ -1,7 +1,7 @@ { "values": [ - "ftbmaterials:quartz_end_ore", "ftbmaterials:quartz_deepslate_ore", + "ftbmaterials:quartz_end_ore", "ftbmaterials:quartz_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/block/ores/resonating_ore.json b/fabric/src/main/generated/data/c/tags/block/ores/resonating_ore.json index 86f3acd..bfb154e 100644 --- a/fabric/src/main/generated/data/c/tags/block/ores/resonating_ore.json +++ b/fabric/src/main/generated/data/c/tags/block/ores/resonating_ore.json @@ -1,8 +1,8 @@ { "values": [ - "ftbmaterials:resonating_ore_end_ore", "ftbmaterials:resonating_ore_deepslate_ore", - "ftbmaterials:resonating_ore_stone_ore", - "ftbmaterials:resonating_ore_nether_ore" + "ftbmaterials:resonating_ore_end_ore", + "ftbmaterials:resonating_ore_nether_ore", + "ftbmaterials:resonating_ore_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/block/ores/silver.json b/fabric/src/main/generated/data/c/tags/block/ores/silver.json index 72537a6..8249c2e 100644 --- a/fabric/src/main/generated/data/c/tags/block/ores/silver.json +++ b/fabric/src/main/generated/data/c/tags/block/ores/silver.json @@ -1,8 +1,8 @@ { "values": [ "ftbmaterials:silver_deepslate_ore", - "ftbmaterials:silver_stone_ore", "ftbmaterials:silver_end_ore", - "ftbmaterials:silver_nether_ore" + "ftbmaterials:silver_nether_ore", + "ftbmaterials:silver_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/block/ores/sulfur.json b/fabric/src/main/generated/data/c/tags/block/ores/sulfur.json index f92e8ed..456224a 100644 --- a/fabric/src/main/generated/data/c/tags/block/ores/sulfur.json +++ b/fabric/src/main/generated/data/c/tags/block/ores/sulfur.json @@ -1,8 +1,8 @@ { "values": [ - "ftbmaterials:sulfur_end_ore", "ftbmaterials:sulfur_deepslate_ore", - "ftbmaterials:sulfur_stone_ore", - "ftbmaterials:sulfur_nether_ore" + "ftbmaterials:sulfur_end_ore", + "ftbmaterials:sulfur_nether_ore", + "ftbmaterials:sulfur_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/block/ores/tin.json b/fabric/src/main/generated/data/c/tags/block/ores/tin.json index a67ca21..a3a6e9b 100644 --- a/fabric/src/main/generated/data/c/tags/block/ores/tin.json +++ b/fabric/src/main/generated/data/c/tags/block/ores/tin.json @@ -1,8 +1,8 @@ { "values": [ "ftbmaterials:tin_deepslate_ore", - "ftbmaterials:tin_stone_ore", "ftbmaterials:tin_end_ore", - "ftbmaterials:tin_nether_ore" + "ftbmaterials:tin_nether_ore", + "ftbmaterials:tin_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/block/ores/titanium.json b/fabric/src/main/generated/data/c/tags/block/ores/titanium.json index 8a6d861..8c92fbe 100644 --- a/fabric/src/main/generated/data/c/tags/block/ores/titanium.json +++ b/fabric/src/main/generated/data/c/tags/block/ores/titanium.json @@ -1,8 +1,8 @@ { "values": [ "ftbmaterials:titanium_deepslate_ore", - "ftbmaterials:titanium_stone_ore", "ftbmaterials:titanium_end_ore", - "ftbmaterials:titanium_nether_ore" + "ftbmaterials:titanium_nether_ore", + "ftbmaterials:titanium_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/block/ores/tungsten.json b/fabric/src/main/generated/data/c/tags/block/ores/tungsten.json index a90a161..d641fc7 100644 --- a/fabric/src/main/generated/data/c/tags/block/ores/tungsten.json +++ b/fabric/src/main/generated/data/c/tags/block/ores/tungsten.json @@ -1,8 +1,8 @@ { "values": [ "ftbmaterials:tungsten_deepslate_ore", - "ftbmaterials:tungsten_stone_ore", "ftbmaterials:tungsten_end_ore", - "ftbmaterials:tungsten_nether_ore" + "ftbmaterials:tungsten_nether_ore", + "ftbmaterials:tungsten_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/block/ores/uranium.json b/fabric/src/main/generated/data/c/tags/block/ores/uranium.json index 6e7e9a5..e0840f3 100644 --- a/fabric/src/main/generated/data/c/tags/block/ores/uranium.json +++ b/fabric/src/main/generated/data/c/tags/block/ores/uranium.json @@ -1,8 +1,8 @@ { "values": [ "ftbmaterials:uranium_deepslate_ore", - "ftbmaterials:uranium_stone_ore", "ftbmaterials:uranium_end_ore", - "ftbmaterials:uranium_nether_ore" + "ftbmaterials:uranium_nether_ore", + "ftbmaterials:uranium_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/block/ores/zinc.json b/fabric/src/main/generated/data/c/tags/block/ores/zinc.json index 0d9af99..04b18db 100644 --- a/fabric/src/main/generated/data/c/tags/block/ores/zinc.json +++ b/fabric/src/main/generated/data/c/tags/block/ores/zinc.json @@ -1,8 +1,8 @@ { "values": [ "ftbmaterials:zinc_deepslate_ore", - "ftbmaterials:zinc_stone_ore", "ftbmaterials:zinc_end_ore", - "ftbmaterials:zinc_nether_ore" + "ftbmaterials:zinc_nether_ore", + "ftbmaterials:zinc_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/block/storage_blocks.json b/fabric/src/main/generated/data/c/tags/block/storage_blocks.json index afe2f40..8133f24 100644 --- a/fabric/src/main/generated/data/c/tags/block/storage_blocks.json +++ b/fabric/src/main/generated/data/c/tags/block/storage_blocks.json @@ -1,54 +1,54 @@ { "values": [ - "ftbmaterials:aluminum_raw_block", "ftbmaterials:aluminum_block", + "ftbmaterials:aluminum_raw_block", "ftbmaterials:apatite_block", "ftbmaterials:bronze_block", "ftbmaterials:constantan_block", "ftbmaterials:electrum_block", "ftbmaterials:graphite_block", "ftbmaterials:invar_block", - "ftbmaterials:lead_raw_block", "ftbmaterials:lead_block", + "ftbmaterials:lead_raw_block", "ftbmaterials:lumium_block", - "ftbmaterials:nickel_raw_block", "ftbmaterials:nickel_block", - "ftbmaterials:osmium_raw_block", + "ftbmaterials:nickel_raw_block", "ftbmaterials:osmium_block", + "ftbmaterials:osmium_raw_block", "ftbmaterials:refined_glowstone_block", - "ftbmaterials:silver_raw_block", "ftbmaterials:silver_block", + "ftbmaterials:silver_raw_block", "ftbmaterials:steel_block", "ftbmaterials:sulfur_block", - "ftbmaterials:tin_raw_block", "ftbmaterials:tin_block", - "ftbmaterials:uranium_raw_block", + "ftbmaterials:tin_raw_block", "ftbmaterials:uranium_block", - "ftbmaterials:zinc_raw_block", + "ftbmaterials:uranium_raw_block", "ftbmaterials:zinc_block", + "ftbmaterials:zinc_raw_block", "ftbmaterials:fluorite_block", "ftbmaterials:resonating_ore_block", "ftbmaterials:dimensional_shard_block", - "ftbmaterials:antimony_raw_block", "ftbmaterials:antimony_block", + "ftbmaterials:antimony_raw_block", "ftbmaterials:bauxite_block", - "ftbmaterials:iridium_raw_block", "ftbmaterials:iridium_block", + "ftbmaterials:iridium_raw_block", "ftbmaterials:monazite_block", - "ftbmaterials:tungsten_raw_block", "ftbmaterials:tungsten_block", - "ftbmaterials:titanium_raw_block", + "ftbmaterials:tungsten_raw_block", "ftbmaterials:titanium_block", - "ftbmaterials:platinum_raw_block", + "ftbmaterials:titanium_raw_block", "ftbmaterials:platinum_block", + "ftbmaterials:platinum_raw_block", "ftbmaterials:stainless_steel_block", - "ftbmaterials:plutonium_raw_block", "ftbmaterials:plutonium_block", - "ftbmaterials:chromium_raw_block", + "ftbmaterials:plutonium_raw_block", "ftbmaterials:chromium_block", - "ftbmaterials:silicon_raw_block", + "ftbmaterials:chromium_raw_block", "ftbmaterials:silicon_block", - "ftbmaterials:brass_raw_block", - "ftbmaterials:brass_block" + "ftbmaterials:silicon_raw_block", + "ftbmaterials:brass_block", + "ftbmaterials:brass_raw_block" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/clumps.json b/fabric/src/main/generated/data/c/tags/item/clumps.json index 0e7b4b1..72e84b5 100644 --- a/fabric/src/main/generated/data/c/tags/item/clumps.json +++ b/fabric/src/main/generated/data/c/tags/item/clumps.json @@ -1,6 +1,7 @@ { "values": [ "ftbmaterials:aluminum_clump", + "ftbmaterials:copper_clump", "ftbmaterials:diamond_clump", "ftbmaterials:gold_clump", "ftbmaterials:iron_clump", diff --git a/fabric/src/main/generated/data/c/tags/item/clumps/copper.json b/fabric/src/main/generated/data/c/tags/item/clumps/copper.json new file mode 100644 index 0000000..c6e9bd3 --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/clumps/copper.json @@ -0,0 +1,5 @@ +{ + "values": [ + "ftbmaterials:copper_clump" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/crystals.json b/fabric/src/main/generated/data/c/tags/item/crystals.json index 15d5a42..ac15a84 100644 --- a/fabric/src/main/generated/data/c/tags/item/crystals.json +++ b/fabric/src/main/generated/data/c/tags/item/crystals.json @@ -1,6 +1,7 @@ { "values": [ "ftbmaterials:aluminum_crystal", + "ftbmaterials:copper_crystal", "ftbmaterials:diamond_crystal", "ftbmaterials:gold_crystal", "ftbmaterials:iron_crystal", diff --git a/fabric/src/main/generated/data/c/tags/item/crystals/copper.json b/fabric/src/main/generated/data/c/tags/item/crystals/copper.json new file mode 100644 index 0000000..8867964 --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/crystals/copper.json @@ -0,0 +1,5 @@ +{ + "values": [ + "ftbmaterials:copper_crystal" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/dirty_dusts.json b/fabric/src/main/generated/data/c/tags/item/dirty_dusts.json index 9059adb..f708822 100644 --- a/fabric/src/main/generated/data/c/tags/item/dirty_dusts.json +++ b/fabric/src/main/generated/data/c/tags/item/dirty_dusts.json @@ -1,6 +1,7 @@ { "values": [ "ftbmaterials:aluminum_dirty_dust", + "ftbmaterials:copper_dirty_dust", "ftbmaterials:diamond_dirty_dust", "ftbmaterials:gold_dirty_dust", "ftbmaterials:iron_dirty_dust", diff --git a/fabric/src/main/generated/data/c/tags/item/dirty_dusts/copper.json b/fabric/src/main/generated/data/c/tags/item/dirty_dusts/copper.json new file mode 100644 index 0000000..79d5b87 --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/dirty_dusts/copper.json @@ -0,0 +1,5 @@ +{ + "values": [ + "ftbmaterials:copper_dirty_dust" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/ores.json b/fabric/src/main/generated/data/c/tags/item/ores.json index 35db410..bdbdc1f 100644 --- a/fabric/src/main/generated/data/c/tags/item/ores.json +++ b/fabric/src/main/generated/data/c/tags/item/ores.json @@ -2,12 +2,12 @@ "values": [ "ftbmaterials:aluminum_deepslate_ore", "ftbmaterials:aluminum_deepslate_ore", - "ftbmaterials:aluminum_stone_ore", - "ftbmaterials:aluminum_stone_ore", "ftbmaterials:aluminum_end_ore", "ftbmaterials:aluminum_end_ore", "ftbmaterials:aluminum_nether_ore", "ftbmaterials:aluminum_nether_ore", + "ftbmaterials:aluminum_stone_ore", + "ftbmaterials:aluminum_stone_ore", "ftbmaterials:copper_end_ore", "ftbmaterials:copper_end_ore", "ftbmaterials:copper_nether_ore", @@ -26,86 +26,86 @@ "ftbmaterials:iron_nether_ore", "ftbmaterials:lead_deepslate_ore", "ftbmaterials:lead_deepslate_ore", - "ftbmaterials:lead_stone_ore", - "ftbmaterials:lead_stone_ore", "ftbmaterials:lead_end_ore", "ftbmaterials:lead_end_ore", "ftbmaterials:lead_nether_ore", "ftbmaterials:lead_nether_ore", + "ftbmaterials:lead_stone_ore", + "ftbmaterials:lead_stone_ore", "ftbmaterials:nickel_deepslate_ore", "ftbmaterials:nickel_deepslate_ore", - "ftbmaterials:nickel_stone_ore", - "ftbmaterials:nickel_stone_ore", "ftbmaterials:nickel_end_ore", "ftbmaterials:nickel_end_ore", "ftbmaterials:nickel_nether_ore", "ftbmaterials:nickel_nether_ore", + "ftbmaterials:nickel_stone_ore", + "ftbmaterials:nickel_stone_ore", "ftbmaterials:osmium_deepslate_ore", "ftbmaterials:osmium_deepslate_ore", - "ftbmaterials:osmium_stone_ore", - "ftbmaterials:osmium_stone_ore", "ftbmaterials:osmium_end_ore", "ftbmaterials:osmium_end_ore", "ftbmaterials:osmium_nether_ore", "ftbmaterials:osmium_nether_ore", - "ftbmaterials:quartz_end_ore", - "ftbmaterials:quartz_end_ore", + "ftbmaterials:osmium_stone_ore", + "ftbmaterials:osmium_stone_ore", "ftbmaterials:quartz_deepslate_ore", "ftbmaterials:quartz_deepslate_ore", + "ftbmaterials:quartz_end_ore", + "ftbmaterials:quartz_end_ore", "ftbmaterials:quartz_stone_ore", "ftbmaterials:quartz_stone_ore", "ftbmaterials:silver_deepslate_ore", "ftbmaterials:silver_deepslate_ore", - "ftbmaterials:silver_stone_ore", - "ftbmaterials:silver_stone_ore", "ftbmaterials:silver_end_ore", "ftbmaterials:silver_end_ore", "ftbmaterials:silver_nether_ore", "ftbmaterials:silver_nether_ore", - "ftbmaterials:sulfur_end_ore", - "ftbmaterials:sulfur_end_ore", + "ftbmaterials:silver_stone_ore", + "ftbmaterials:silver_stone_ore", "ftbmaterials:sulfur_deepslate_ore", "ftbmaterials:sulfur_deepslate_ore", - "ftbmaterials:sulfur_stone_ore", - "ftbmaterials:sulfur_stone_ore", + "ftbmaterials:sulfur_end_ore", + "ftbmaterials:sulfur_end_ore", "ftbmaterials:sulfur_nether_ore", "ftbmaterials:sulfur_nether_ore", + "ftbmaterials:sulfur_stone_ore", + "ftbmaterials:sulfur_stone_ore", "ftbmaterials:tin_deepslate_ore", "ftbmaterials:tin_deepslate_ore", - "ftbmaterials:tin_stone_ore", - "ftbmaterials:tin_stone_ore", "ftbmaterials:tin_end_ore", "ftbmaterials:tin_end_ore", "ftbmaterials:tin_nether_ore", "ftbmaterials:tin_nether_ore", + "ftbmaterials:tin_stone_ore", + "ftbmaterials:tin_stone_ore", "ftbmaterials:uranium_deepslate_ore", "ftbmaterials:uranium_deepslate_ore", - "ftbmaterials:uranium_stone_ore", - "ftbmaterials:uranium_stone_ore", "ftbmaterials:uranium_end_ore", "ftbmaterials:uranium_end_ore", "ftbmaterials:uranium_nether_ore", "ftbmaterials:uranium_nether_ore", + "ftbmaterials:uranium_stone_ore", + "ftbmaterials:uranium_stone_ore", "ftbmaterials:zinc_deepslate_ore", "ftbmaterials:zinc_deepslate_ore", - "ftbmaterials:zinc_stone_ore", - "ftbmaterials:zinc_stone_ore", "ftbmaterials:zinc_end_ore", "ftbmaterials:zinc_end_ore", "ftbmaterials:zinc_nether_ore", "ftbmaterials:zinc_nether_ore", + "ftbmaterials:zinc_stone_ore", + "ftbmaterials:zinc_stone_ore", "ftbmaterials:redstone_end_ore", "ftbmaterials:redstone_end_ore", "ftbmaterials:redstone_nether_ore", "ftbmaterials:redstone_nether_ore", - "ftbmaterials:fluorite_end_ore", - "ftbmaterials:fluorite_end_ore", "ftbmaterials:fluorite_deepslate_ore", "ftbmaterials:fluorite_deepslate_ore", - "ftbmaterials:fluorite_stone_ore", - "ftbmaterials:fluorite_stone_ore", + "ftbmaterials:fluorite_end_ore", + "ftbmaterials:fluorite_end_ore", "ftbmaterials:fluorite_nether_ore", "ftbmaterials:fluorite_nether_ore", + "ftbmaterials:fluorite_stone_ore", + "ftbmaterials:fluorite_stone_ore", "ftbmaterials:emerald_end_ore", "ftbmaterials:emerald_end_ore", "ftbmaterials:emerald_nether_ore", @@ -114,77 +114,77 @@ "ftbmaterials:lapis_lazuli_end_ore", "ftbmaterials:lapis_lazuli_nether_ore", "ftbmaterials:lapis_lazuli_nether_ore", - "ftbmaterials:resonating_ore_end_ore", - "ftbmaterials:resonating_ore_end_ore", "ftbmaterials:resonating_ore_deepslate_ore", "ftbmaterials:resonating_ore_deepslate_ore", - "ftbmaterials:resonating_ore_stone_ore", - "ftbmaterials:resonating_ore_stone_ore", + "ftbmaterials:resonating_ore_end_ore", + "ftbmaterials:resonating_ore_end_ore", "ftbmaterials:resonating_ore_nether_ore", "ftbmaterials:resonating_ore_nether_ore", - "ftbmaterials:dimensional_shard_end_ore", - "ftbmaterials:dimensional_shard_end_ore", + "ftbmaterials:resonating_ore_stone_ore", + "ftbmaterials:resonating_ore_stone_ore", "ftbmaterials:dimensional_shard_deepslate_ore", "ftbmaterials:dimensional_shard_deepslate_ore", - "ftbmaterials:dimensional_shard_stone_ore", - "ftbmaterials:dimensional_shard_stone_ore", + "ftbmaterials:dimensional_shard_end_ore", + "ftbmaterials:dimensional_shard_end_ore", "ftbmaterials:dimensional_shard_nether_ore", "ftbmaterials:dimensional_shard_nether_ore", + "ftbmaterials:dimensional_shard_stone_ore", + "ftbmaterials:dimensional_shard_stone_ore", "ftbmaterials:antimony_deepslate_ore", "ftbmaterials:antimony_deepslate_ore", - "ftbmaterials:antimony_stone_ore", - "ftbmaterials:antimony_stone_ore", "ftbmaterials:antimony_end_ore", "ftbmaterials:antimony_end_ore", "ftbmaterials:antimony_nether_ore", "ftbmaterials:antimony_nether_ore", - "ftbmaterials:bauxite_end_ore", - "ftbmaterials:bauxite_end_ore", + "ftbmaterials:antimony_stone_ore", + "ftbmaterials:antimony_stone_ore", "ftbmaterials:bauxite_deepslate_ore", "ftbmaterials:bauxite_deepslate_ore", - "ftbmaterials:bauxite_stone_ore", - "ftbmaterials:bauxite_stone_ore", + "ftbmaterials:bauxite_end_ore", + "ftbmaterials:bauxite_end_ore", "ftbmaterials:bauxite_nether_ore", "ftbmaterials:bauxite_nether_ore", + "ftbmaterials:bauxite_stone_ore", + "ftbmaterials:bauxite_stone_ore", "ftbmaterials:iridium_deepslate_ore", "ftbmaterials:iridium_deepslate_ore", - "ftbmaterials:iridium_stone_ore", - "ftbmaterials:iridium_stone_ore", "ftbmaterials:iridium_end_ore", "ftbmaterials:iridium_end_ore", "ftbmaterials:iridium_nether_ore", "ftbmaterials:iridium_nether_ore", - "ftbmaterials:monazite_end_ore", - "ftbmaterials:monazite_end_ore", + "ftbmaterials:iridium_stone_ore", + "ftbmaterials:iridium_stone_ore", "ftbmaterials:monazite_deepslate_ore", "ftbmaterials:monazite_deepslate_ore", - "ftbmaterials:monazite_stone_ore", - "ftbmaterials:monazite_stone_ore", + "ftbmaterials:monazite_end_ore", + "ftbmaterials:monazite_end_ore", "ftbmaterials:monazite_nether_ore", "ftbmaterials:monazite_nether_ore", + "ftbmaterials:monazite_stone_ore", + "ftbmaterials:monazite_stone_ore", "ftbmaterials:tungsten_deepslate_ore", "ftbmaterials:tungsten_deepslate_ore", - "ftbmaterials:tungsten_stone_ore", - "ftbmaterials:tungsten_stone_ore", "ftbmaterials:tungsten_end_ore", "ftbmaterials:tungsten_end_ore", "ftbmaterials:tungsten_nether_ore", "ftbmaterials:tungsten_nether_ore", + "ftbmaterials:tungsten_stone_ore", + "ftbmaterials:tungsten_stone_ore", "ftbmaterials:titanium_deepslate_ore", "ftbmaterials:titanium_deepslate_ore", - "ftbmaterials:titanium_stone_ore", - "ftbmaterials:titanium_stone_ore", "ftbmaterials:titanium_end_ore", "ftbmaterials:titanium_end_ore", "ftbmaterials:titanium_nether_ore", "ftbmaterials:titanium_nether_ore", + "ftbmaterials:titanium_stone_ore", + "ftbmaterials:titanium_stone_ore", "ftbmaterials:platinum_deepslate_ore", "ftbmaterials:platinum_deepslate_ore", - "ftbmaterials:platinum_stone_ore", - "ftbmaterials:platinum_stone_ore", "ftbmaterials:platinum_end_ore", "ftbmaterials:platinum_end_ore", "ftbmaterials:platinum_nether_ore", - "ftbmaterials:platinum_nether_ore" + "ftbmaterials:platinum_nether_ore", + "ftbmaterials:platinum_stone_ore", + "ftbmaterials:platinum_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/ores/aluminum.json b/fabric/src/main/generated/data/c/tags/item/ores/aluminum.json index ad51549..3d30c92 100644 --- a/fabric/src/main/generated/data/c/tags/item/ores/aluminum.json +++ b/fabric/src/main/generated/data/c/tags/item/ores/aluminum.json @@ -1,8 +1,8 @@ { "values": [ "ftbmaterials:aluminum_deepslate_ore", - "ftbmaterials:aluminum_stone_ore", "ftbmaterials:aluminum_end_ore", - "ftbmaterials:aluminum_nether_ore" + "ftbmaterials:aluminum_nether_ore", + "ftbmaterials:aluminum_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/ores/antimony.json b/fabric/src/main/generated/data/c/tags/item/ores/antimony.json index 42857c6..46715ef 100644 --- a/fabric/src/main/generated/data/c/tags/item/ores/antimony.json +++ b/fabric/src/main/generated/data/c/tags/item/ores/antimony.json @@ -1,8 +1,8 @@ { "values": [ "ftbmaterials:antimony_deepslate_ore", - "ftbmaterials:antimony_stone_ore", "ftbmaterials:antimony_end_ore", - "ftbmaterials:antimony_nether_ore" + "ftbmaterials:antimony_nether_ore", + "ftbmaterials:antimony_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/ores/bauxite.json b/fabric/src/main/generated/data/c/tags/item/ores/bauxite.json index 015246e..d1985c2 100644 --- a/fabric/src/main/generated/data/c/tags/item/ores/bauxite.json +++ b/fabric/src/main/generated/data/c/tags/item/ores/bauxite.json @@ -1,8 +1,8 @@ { "values": [ - "ftbmaterials:bauxite_end_ore", "ftbmaterials:bauxite_deepslate_ore", - "ftbmaterials:bauxite_stone_ore", - "ftbmaterials:bauxite_nether_ore" + "ftbmaterials:bauxite_end_ore", + "ftbmaterials:bauxite_nether_ore", + "ftbmaterials:bauxite_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/ores/dimensional_shard.json b/fabric/src/main/generated/data/c/tags/item/ores/dimensional_shard.json index 0a2dbfb..00a7a78 100644 --- a/fabric/src/main/generated/data/c/tags/item/ores/dimensional_shard.json +++ b/fabric/src/main/generated/data/c/tags/item/ores/dimensional_shard.json @@ -1,8 +1,8 @@ { "values": [ - "ftbmaterials:dimensional_shard_end_ore", "ftbmaterials:dimensional_shard_deepslate_ore", - "ftbmaterials:dimensional_shard_stone_ore", - "ftbmaterials:dimensional_shard_nether_ore" + "ftbmaterials:dimensional_shard_end_ore", + "ftbmaterials:dimensional_shard_nether_ore", + "ftbmaterials:dimensional_shard_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/ores/fluorite.json b/fabric/src/main/generated/data/c/tags/item/ores/fluorite.json index b1bf451..3633339 100644 --- a/fabric/src/main/generated/data/c/tags/item/ores/fluorite.json +++ b/fabric/src/main/generated/data/c/tags/item/ores/fluorite.json @@ -1,8 +1,8 @@ { "values": [ - "ftbmaterials:fluorite_end_ore", "ftbmaterials:fluorite_deepslate_ore", - "ftbmaterials:fluorite_stone_ore", - "ftbmaterials:fluorite_nether_ore" + "ftbmaterials:fluorite_end_ore", + "ftbmaterials:fluorite_nether_ore", + "ftbmaterials:fluorite_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/ores/iridium.json b/fabric/src/main/generated/data/c/tags/item/ores/iridium.json index 517905a..5a8fb00 100644 --- a/fabric/src/main/generated/data/c/tags/item/ores/iridium.json +++ b/fabric/src/main/generated/data/c/tags/item/ores/iridium.json @@ -1,8 +1,8 @@ { "values": [ "ftbmaterials:iridium_deepslate_ore", - "ftbmaterials:iridium_stone_ore", "ftbmaterials:iridium_end_ore", - "ftbmaterials:iridium_nether_ore" + "ftbmaterials:iridium_nether_ore", + "ftbmaterials:iridium_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/ores/lead.json b/fabric/src/main/generated/data/c/tags/item/ores/lead.json index f3ae24b..f437f0b 100644 --- a/fabric/src/main/generated/data/c/tags/item/ores/lead.json +++ b/fabric/src/main/generated/data/c/tags/item/ores/lead.json @@ -1,8 +1,8 @@ { "values": [ "ftbmaterials:lead_deepslate_ore", - "ftbmaterials:lead_stone_ore", "ftbmaterials:lead_end_ore", - "ftbmaterials:lead_nether_ore" + "ftbmaterials:lead_nether_ore", + "ftbmaterials:lead_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/ores/monazite.json b/fabric/src/main/generated/data/c/tags/item/ores/monazite.json index 5f46665..53052ac 100644 --- a/fabric/src/main/generated/data/c/tags/item/ores/monazite.json +++ b/fabric/src/main/generated/data/c/tags/item/ores/monazite.json @@ -1,8 +1,8 @@ { "values": [ - "ftbmaterials:monazite_end_ore", "ftbmaterials:monazite_deepslate_ore", - "ftbmaterials:monazite_stone_ore", - "ftbmaterials:monazite_nether_ore" + "ftbmaterials:monazite_end_ore", + "ftbmaterials:monazite_nether_ore", + "ftbmaterials:monazite_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/ores/nickel.json b/fabric/src/main/generated/data/c/tags/item/ores/nickel.json index 0a778bd..6d58015 100644 --- a/fabric/src/main/generated/data/c/tags/item/ores/nickel.json +++ b/fabric/src/main/generated/data/c/tags/item/ores/nickel.json @@ -1,8 +1,8 @@ { "values": [ "ftbmaterials:nickel_deepslate_ore", - "ftbmaterials:nickel_stone_ore", "ftbmaterials:nickel_end_ore", - "ftbmaterials:nickel_nether_ore" + "ftbmaterials:nickel_nether_ore", + "ftbmaterials:nickel_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/ores/osmium.json b/fabric/src/main/generated/data/c/tags/item/ores/osmium.json index 39d8778..768a73e 100644 --- a/fabric/src/main/generated/data/c/tags/item/ores/osmium.json +++ b/fabric/src/main/generated/data/c/tags/item/ores/osmium.json @@ -1,8 +1,8 @@ { "values": [ "ftbmaterials:osmium_deepslate_ore", - "ftbmaterials:osmium_stone_ore", "ftbmaterials:osmium_end_ore", - "ftbmaterials:osmium_nether_ore" + "ftbmaterials:osmium_nether_ore", + "ftbmaterials:osmium_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/ores/platinum.json b/fabric/src/main/generated/data/c/tags/item/ores/platinum.json index a7aa4d6..7dcfa4e 100644 --- a/fabric/src/main/generated/data/c/tags/item/ores/platinum.json +++ b/fabric/src/main/generated/data/c/tags/item/ores/platinum.json @@ -1,8 +1,8 @@ { "values": [ "ftbmaterials:platinum_deepslate_ore", - "ftbmaterials:platinum_stone_ore", "ftbmaterials:platinum_end_ore", - "ftbmaterials:platinum_nether_ore" + "ftbmaterials:platinum_nether_ore", + "ftbmaterials:platinum_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/ores/quartz.json b/fabric/src/main/generated/data/c/tags/item/ores/quartz.json index 2c1a692..3b6bdb7 100644 --- a/fabric/src/main/generated/data/c/tags/item/ores/quartz.json +++ b/fabric/src/main/generated/data/c/tags/item/ores/quartz.json @@ -1,7 +1,7 @@ { "values": [ - "ftbmaterials:quartz_end_ore", "ftbmaterials:quartz_deepslate_ore", + "ftbmaterials:quartz_end_ore", "ftbmaterials:quartz_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/ores/resonating_ore.json b/fabric/src/main/generated/data/c/tags/item/ores/resonating_ore.json index 86f3acd..bfb154e 100644 --- a/fabric/src/main/generated/data/c/tags/item/ores/resonating_ore.json +++ b/fabric/src/main/generated/data/c/tags/item/ores/resonating_ore.json @@ -1,8 +1,8 @@ { "values": [ - "ftbmaterials:resonating_ore_end_ore", "ftbmaterials:resonating_ore_deepslate_ore", - "ftbmaterials:resonating_ore_stone_ore", - "ftbmaterials:resonating_ore_nether_ore" + "ftbmaterials:resonating_ore_end_ore", + "ftbmaterials:resonating_ore_nether_ore", + "ftbmaterials:resonating_ore_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/ores/silver.json b/fabric/src/main/generated/data/c/tags/item/ores/silver.json index 72537a6..8249c2e 100644 --- a/fabric/src/main/generated/data/c/tags/item/ores/silver.json +++ b/fabric/src/main/generated/data/c/tags/item/ores/silver.json @@ -1,8 +1,8 @@ { "values": [ "ftbmaterials:silver_deepslate_ore", - "ftbmaterials:silver_stone_ore", "ftbmaterials:silver_end_ore", - "ftbmaterials:silver_nether_ore" + "ftbmaterials:silver_nether_ore", + "ftbmaterials:silver_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/ores/sulfur.json b/fabric/src/main/generated/data/c/tags/item/ores/sulfur.json index f92e8ed..456224a 100644 --- a/fabric/src/main/generated/data/c/tags/item/ores/sulfur.json +++ b/fabric/src/main/generated/data/c/tags/item/ores/sulfur.json @@ -1,8 +1,8 @@ { "values": [ - "ftbmaterials:sulfur_end_ore", "ftbmaterials:sulfur_deepslate_ore", - "ftbmaterials:sulfur_stone_ore", - "ftbmaterials:sulfur_nether_ore" + "ftbmaterials:sulfur_end_ore", + "ftbmaterials:sulfur_nether_ore", + "ftbmaterials:sulfur_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/ores/tin.json b/fabric/src/main/generated/data/c/tags/item/ores/tin.json index a67ca21..a3a6e9b 100644 --- a/fabric/src/main/generated/data/c/tags/item/ores/tin.json +++ b/fabric/src/main/generated/data/c/tags/item/ores/tin.json @@ -1,8 +1,8 @@ { "values": [ "ftbmaterials:tin_deepslate_ore", - "ftbmaterials:tin_stone_ore", "ftbmaterials:tin_end_ore", - "ftbmaterials:tin_nether_ore" + "ftbmaterials:tin_nether_ore", + "ftbmaterials:tin_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/ores/titanium.json b/fabric/src/main/generated/data/c/tags/item/ores/titanium.json index 8a6d861..8c92fbe 100644 --- a/fabric/src/main/generated/data/c/tags/item/ores/titanium.json +++ b/fabric/src/main/generated/data/c/tags/item/ores/titanium.json @@ -1,8 +1,8 @@ { "values": [ "ftbmaterials:titanium_deepslate_ore", - "ftbmaterials:titanium_stone_ore", "ftbmaterials:titanium_end_ore", - "ftbmaterials:titanium_nether_ore" + "ftbmaterials:titanium_nether_ore", + "ftbmaterials:titanium_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/ores/tungsten.json b/fabric/src/main/generated/data/c/tags/item/ores/tungsten.json index a90a161..d641fc7 100644 --- a/fabric/src/main/generated/data/c/tags/item/ores/tungsten.json +++ b/fabric/src/main/generated/data/c/tags/item/ores/tungsten.json @@ -1,8 +1,8 @@ { "values": [ "ftbmaterials:tungsten_deepslate_ore", - "ftbmaterials:tungsten_stone_ore", "ftbmaterials:tungsten_end_ore", - "ftbmaterials:tungsten_nether_ore" + "ftbmaterials:tungsten_nether_ore", + "ftbmaterials:tungsten_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/ores/uranium.json b/fabric/src/main/generated/data/c/tags/item/ores/uranium.json index 6e7e9a5..e0840f3 100644 --- a/fabric/src/main/generated/data/c/tags/item/ores/uranium.json +++ b/fabric/src/main/generated/data/c/tags/item/ores/uranium.json @@ -1,8 +1,8 @@ { "values": [ "ftbmaterials:uranium_deepslate_ore", - "ftbmaterials:uranium_stone_ore", "ftbmaterials:uranium_end_ore", - "ftbmaterials:uranium_nether_ore" + "ftbmaterials:uranium_nether_ore", + "ftbmaterials:uranium_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/ores/zinc.json b/fabric/src/main/generated/data/c/tags/item/ores/zinc.json index 0d9af99..04b18db 100644 --- a/fabric/src/main/generated/data/c/tags/item/ores/zinc.json +++ b/fabric/src/main/generated/data/c/tags/item/ores/zinc.json @@ -1,8 +1,8 @@ { "values": [ "ftbmaterials:zinc_deepslate_ore", - "ftbmaterials:zinc_stone_ore", "ftbmaterials:zinc_end_ore", - "ftbmaterials:zinc_nether_ore" + "ftbmaterials:zinc_nether_ore", + "ftbmaterials:zinc_stone_ore" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/shards.json b/fabric/src/main/generated/data/c/tags/item/shards.json index ad23623..ea169c7 100644 --- a/fabric/src/main/generated/data/c/tags/item/shards.json +++ b/fabric/src/main/generated/data/c/tags/item/shards.json @@ -1,6 +1,7 @@ { "values": [ "ftbmaterials:aluminum_shard", + "ftbmaterials:copper_shard", "ftbmaterials:diamond_shard", "ftbmaterials:gold_shard", "ftbmaterials:iron_shard", diff --git a/fabric/src/main/generated/data/c/tags/item/shards/copper.json b/fabric/src/main/generated/data/c/tags/item/shards/copper.json new file mode 100644 index 0000000..74acbbf --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/shards/copper.json @@ -0,0 +1,5 @@ +{ + "values": [ + "ftbmaterials:copper_shard" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/storage_blocks.json b/fabric/src/main/generated/data/c/tags/item/storage_blocks.json index afe2f40..8133f24 100644 --- a/fabric/src/main/generated/data/c/tags/item/storage_blocks.json +++ b/fabric/src/main/generated/data/c/tags/item/storage_blocks.json @@ -1,54 +1,54 @@ { "values": [ - "ftbmaterials:aluminum_raw_block", "ftbmaterials:aluminum_block", + "ftbmaterials:aluminum_raw_block", "ftbmaterials:apatite_block", "ftbmaterials:bronze_block", "ftbmaterials:constantan_block", "ftbmaterials:electrum_block", "ftbmaterials:graphite_block", "ftbmaterials:invar_block", - "ftbmaterials:lead_raw_block", "ftbmaterials:lead_block", + "ftbmaterials:lead_raw_block", "ftbmaterials:lumium_block", - "ftbmaterials:nickel_raw_block", "ftbmaterials:nickel_block", - "ftbmaterials:osmium_raw_block", + "ftbmaterials:nickel_raw_block", "ftbmaterials:osmium_block", + "ftbmaterials:osmium_raw_block", "ftbmaterials:refined_glowstone_block", - "ftbmaterials:silver_raw_block", "ftbmaterials:silver_block", + "ftbmaterials:silver_raw_block", "ftbmaterials:steel_block", "ftbmaterials:sulfur_block", - "ftbmaterials:tin_raw_block", "ftbmaterials:tin_block", - "ftbmaterials:uranium_raw_block", + "ftbmaterials:tin_raw_block", "ftbmaterials:uranium_block", - "ftbmaterials:zinc_raw_block", + "ftbmaterials:uranium_raw_block", "ftbmaterials:zinc_block", + "ftbmaterials:zinc_raw_block", "ftbmaterials:fluorite_block", "ftbmaterials:resonating_ore_block", "ftbmaterials:dimensional_shard_block", - "ftbmaterials:antimony_raw_block", "ftbmaterials:antimony_block", + "ftbmaterials:antimony_raw_block", "ftbmaterials:bauxite_block", - "ftbmaterials:iridium_raw_block", "ftbmaterials:iridium_block", + "ftbmaterials:iridium_raw_block", "ftbmaterials:monazite_block", - "ftbmaterials:tungsten_raw_block", "ftbmaterials:tungsten_block", - "ftbmaterials:titanium_raw_block", + "ftbmaterials:tungsten_raw_block", "ftbmaterials:titanium_block", - "ftbmaterials:platinum_raw_block", + "ftbmaterials:titanium_raw_block", "ftbmaterials:platinum_block", + "ftbmaterials:platinum_raw_block", "ftbmaterials:stainless_steel_block", - "ftbmaterials:plutonium_raw_block", "ftbmaterials:plutonium_block", - "ftbmaterials:chromium_raw_block", + "ftbmaterials:plutonium_raw_block", "ftbmaterials:chromium_block", - "ftbmaterials:silicon_raw_block", + "ftbmaterials:chromium_raw_block", "ftbmaterials:silicon_block", - "ftbmaterials:brass_raw_block", - "ftbmaterials:brass_block" + "ftbmaterials:silicon_raw_block", + "ftbmaterials:brass_block", + "ftbmaterials:brass_raw_block" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/copper_end_ore.json b/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/copper_end_ore.json new file mode 100644 index 0000000..ae5e8c1 --- /dev/null +++ b/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/copper_end_ore.json @@ -0,0 +1,51 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "ftbmaterials:copper_end_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:raw_copper" + } + ] + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/copper_nether_ore.json b/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/copper_nether_ore.json new file mode 100644 index 0000000..3985a28 --- /dev/null +++ b/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/copper_nether_ore.json @@ -0,0 +1,51 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "ftbmaterials:copper_nether_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:raw_copper" + } + ] + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/diamond_end_ore.json b/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/diamond_end_ore.json new file mode 100644 index 0000000..7625614 --- /dev/null +++ b/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/diamond_end_ore.json @@ -0,0 +1,51 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "ftbmaterials:diamond_end_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:diamond" + } + ] + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/diamond_nether_ore.json b/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/diamond_nether_ore.json new file mode 100644 index 0000000..88d3fc8 --- /dev/null +++ b/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/diamond_nether_ore.json @@ -0,0 +1,51 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "ftbmaterials:diamond_nether_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:diamond" + } + ] + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/emerald_end_ore.json b/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/emerald_end_ore.json new file mode 100644 index 0000000..81e3207 --- /dev/null +++ b/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/emerald_end_ore.json @@ -0,0 +1,51 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "ftbmaterials:emerald_end_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:emerald" + } + ] + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/emerald_nether_ore.json b/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/emerald_nether_ore.json new file mode 100644 index 0000000..557e82a --- /dev/null +++ b/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/emerald_nether_ore.json @@ -0,0 +1,51 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "ftbmaterials:emerald_nether_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:emerald" + } + ] + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/gold_end_ore.json b/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/gold_end_ore.json new file mode 100644 index 0000000..01cd149 --- /dev/null +++ b/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/gold_end_ore.json @@ -0,0 +1,51 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "ftbmaterials:gold_end_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:raw_gold" + } + ] + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/gold_nether_ore.json b/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/gold_nether_ore.json new file mode 100644 index 0000000..7bf7166 --- /dev/null +++ b/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/gold_nether_ore.json @@ -0,0 +1,51 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "ftbmaterials:gold_nether_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:raw_gold" + } + ] + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/iron_end_ore.json b/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/iron_end_ore.json new file mode 100644 index 0000000..ef5bec3 --- /dev/null +++ b/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/iron_end_ore.json @@ -0,0 +1,51 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "ftbmaterials:iron_end_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:raw_iron" + } + ] + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/iron_nether_ore.json b/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/iron_nether_ore.json new file mode 100644 index 0000000..08acd47 --- /dev/null +++ b/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/iron_nether_ore.json @@ -0,0 +1,51 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "ftbmaterials:iron_nether_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:raw_iron" + } + ] + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/lapis_lazuli_end_ore.json b/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/lapis_lazuli_end_ore.json new file mode 100644 index 0000000..e71d844 --- /dev/null +++ b/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/lapis_lazuli_end_ore.json @@ -0,0 +1,51 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "ftbmaterials:lapis_lazuli_end_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:lapis_lazuli" + } + ] + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/lapis_lazuli_nether_ore.json b/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/lapis_lazuli_nether_ore.json new file mode 100644 index 0000000..e09fbaf --- /dev/null +++ b/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/lapis_lazuli_nether_ore.json @@ -0,0 +1,51 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "ftbmaterials:lapis_lazuli_nether_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:lapis_lazuli" + } + ] + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/quartz_end_ore.json b/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/quartz_end_ore.json new file mode 100644 index 0000000..3eda56a --- /dev/null +++ b/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/quartz_end_ore.json @@ -0,0 +1,51 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "ftbmaterials:quartz_end_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:quartz" + } + ] + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/redstone_end_ore.json b/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/redstone_end_ore.json new file mode 100644 index 0000000..1975146 --- /dev/null +++ b/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/redstone_end_ore.json @@ -0,0 +1,51 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "ftbmaterials:redstone_end_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:redstone" + } + ] + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/redstone_nether_ore.json b/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/redstone_nether_ore.json new file mode 100644 index 0000000..c791f45 --- /dev/null +++ b/fabric/src/main/generated/data/ftbmaterials/loot_table/blocks/redstone_nether_ore.json @@ -0,0 +1,51 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "ftbmaterials:redstone_nether_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:redstone" + } + ] + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/mekanism/tags/item/shards.json b/fabric/src/main/generated/data/mekanism/tags/item/shards.json index ad23623..ea169c7 100644 --- a/fabric/src/main/generated/data/mekanism/tags/item/shards.json +++ b/fabric/src/main/generated/data/mekanism/tags/item/shards.json @@ -1,6 +1,7 @@ { "values": [ "ftbmaterials:aluminum_shard", + "ftbmaterials:copper_shard", "ftbmaterials:diamond_shard", "ftbmaterials:gold_shard", "ftbmaterials:iron_shard", diff --git a/fabric/src/main/generated/data/mekanism/tags/item/shards/copper.json b/fabric/src/main/generated/data/mekanism/tags/item/shards/copper.json new file mode 100644 index 0000000..74acbbf --- /dev/null +++ b/fabric/src/main/generated/data/mekanism/tags/item/shards/copper.json @@ -0,0 +1,5 @@ +{ + "values": [ + "ftbmaterials:copper_shard" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/minecraft/tags/block/incorrect_for_wooden_tool.json b/fabric/src/main/generated/data/minecraft/tags/block/incorrect_for_wooden_tool.json index b42c5fd..bd8fc6e 100644 --- a/fabric/src/main/generated/data/minecraft/tags/block/incorrect_for_wooden_tool.json +++ b/fabric/src/main/generated/data/minecraft/tags/block/incorrect_for_wooden_tool.json @@ -1,11 +1,11 @@ { "values": [ "ftbmaterials:aluminum_deepslate_ore", - "ftbmaterials:aluminum_stone_ore", + "ftbmaterials:aluminum_block", "ftbmaterials:aluminum_raw_block", "ftbmaterials:aluminum_end_ore", "ftbmaterials:aluminum_nether_ore", - "ftbmaterials:aluminum_block", + "ftbmaterials:aluminum_stone_ore", "ftbmaterials:apatite_block", "ftbmaterials:bronze_block", "ftbmaterials:constantan_block", @@ -21,127 +21,127 @@ "ftbmaterials:iron_end_ore", "ftbmaterials:iron_nether_ore", "ftbmaterials:lead_deepslate_ore", - "ftbmaterials:lead_stone_ore", + "ftbmaterials:lead_block", "ftbmaterials:lead_raw_block", "ftbmaterials:lead_end_ore", "ftbmaterials:lead_nether_ore", - "ftbmaterials:lead_block", + "ftbmaterials:lead_stone_ore", "ftbmaterials:lumium_block", "ftbmaterials:nickel_deepslate_ore", - "ftbmaterials:nickel_stone_ore", + "ftbmaterials:nickel_block", "ftbmaterials:nickel_raw_block", "ftbmaterials:nickel_end_ore", "ftbmaterials:nickel_nether_ore", - "ftbmaterials:nickel_block", + "ftbmaterials:nickel_stone_ore", "ftbmaterials:osmium_deepslate_ore", - "ftbmaterials:osmium_stone_ore", + "ftbmaterials:osmium_block", "ftbmaterials:osmium_raw_block", "ftbmaterials:osmium_end_ore", "ftbmaterials:osmium_nether_ore", - "ftbmaterials:osmium_block", - "ftbmaterials:quartz_end_ore", + "ftbmaterials:osmium_stone_ore", "ftbmaterials:quartz_deepslate_ore", + "ftbmaterials:quartz_end_ore", "ftbmaterials:quartz_stone_ore", "ftbmaterials:refined_glowstone_block", "ftbmaterials:silver_deepslate_ore", - "ftbmaterials:silver_stone_ore", + "ftbmaterials:silver_block", "ftbmaterials:silver_raw_block", "ftbmaterials:silver_end_ore", "ftbmaterials:silver_nether_ore", - "ftbmaterials:silver_block", + "ftbmaterials:silver_stone_ore", "ftbmaterials:steel_block", - "ftbmaterials:sulfur_end_ore", "ftbmaterials:sulfur_deepslate_ore", - "ftbmaterials:sulfur_stone_ore", + "ftbmaterials:sulfur_end_ore", "ftbmaterials:sulfur_nether_ore", + "ftbmaterials:sulfur_stone_ore", "ftbmaterials:sulfur_block", "ftbmaterials:tin_deepslate_ore", - "ftbmaterials:tin_stone_ore", + "ftbmaterials:tin_block", "ftbmaterials:tin_raw_block", "ftbmaterials:tin_end_ore", "ftbmaterials:tin_nether_ore", - "ftbmaterials:tin_block", + "ftbmaterials:tin_stone_ore", "ftbmaterials:uranium_deepslate_ore", - "ftbmaterials:uranium_stone_ore", + "ftbmaterials:uranium_block", "ftbmaterials:uranium_raw_block", "ftbmaterials:uranium_end_ore", "ftbmaterials:uranium_nether_ore", - "ftbmaterials:uranium_block", + "ftbmaterials:uranium_stone_ore", "ftbmaterials:zinc_deepslate_ore", - "ftbmaterials:zinc_stone_ore", + "ftbmaterials:zinc_block", "ftbmaterials:zinc_raw_block", "ftbmaterials:zinc_end_ore", "ftbmaterials:zinc_nether_ore", - "ftbmaterials:zinc_block", + "ftbmaterials:zinc_stone_ore", "ftbmaterials:redstone_end_ore", "ftbmaterials:redstone_nether_ore", - "ftbmaterials:fluorite_end_ore", "ftbmaterials:fluorite_deepslate_ore", - "ftbmaterials:fluorite_stone_ore", + "ftbmaterials:fluorite_end_ore", "ftbmaterials:fluorite_nether_ore", + "ftbmaterials:fluorite_stone_ore", "ftbmaterials:fluorite_block", "ftbmaterials:emerald_end_ore", "ftbmaterials:emerald_nether_ore", "ftbmaterials:lapis_lazuli_end_ore", "ftbmaterials:lapis_lazuli_nether_ore", - "ftbmaterials:resonating_ore_end_ore", "ftbmaterials:resonating_ore_deepslate_ore", - "ftbmaterials:resonating_ore_stone_ore", + "ftbmaterials:resonating_ore_end_ore", "ftbmaterials:resonating_ore_nether_ore", + "ftbmaterials:resonating_ore_stone_ore", "ftbmaterials:resonating_ore_block", - "ftbmaterials:dimensional_shard_end_ore", "ftbmaterials:dimensional_shard_deepslate_ore", - "ftbmaterials:dimensional_shard_stone_ore", + "ftbmaterials:dimensional_shard_end_ore", "ftbmaterials:dimensional_shard_nether_ore", + "ftbmaterials:dimensional_shard_stone_ore", "ftbmaterials:dimensional_shard_block", "ftbmaterials:antimony_deepslate_ore", - "ftbmaterials:antimony_stone_ore", + "ftbmaterials:antimony_block", "ftbmaterials:antimony_raw_block", "ftbmaterials:antimony_end_ore", "ftbmaterials:antimony_nether_ore", - "ftbmaterials:antimony_block", - "ftbmaterials:bauxite_end_ore", + "ftbmaterials:antimony_stone_ore", "ftbmaterials:bauxite_deepslate_ore", - "ftbmaterials:bauxite_stone_ore", + "ftbmaterials:bauxite_end_ore", "ftbmaterials:bauxite_nether_ore", + "ftbmaterials:bauxite_stone_ore", "ftbmaterials:bauxite_block", "ftbmaterials:iridium_deepslate_ore", - "ftbmaterials:iridium_stone_ore", + "ftbmaterials:iridium_block", "ftbmaterials:iridium_raw_block", "ftbmaterials:iridium_end_ore", "ftbmaterials:iridium_nether_ore", - "ftbmaterials:iridium_block", - "ftbmaterials:monazite_end_ore", + "ftbmaterials:iridium_stone_ore", "ftbmaterials:monazite_deepslate_ore", - "ftbmaterials:monazite_stone_ore", + "ftbmaterials:monazite_end_ore", "ftbmaterials:monazite_nether_ore", + "ftbmaterials:monazite_stone_ore", "ftbmaterials:monazite_block", "ftbmaterials:tungsten_deepslate_ore", - "ftbmaterials:tungsten_stone_ore", + "ftbmaterials:tungsten_block", "ftbmaterials:tungsten_raw_block", "ftbmaterials:tungsten_end_ore", "ftbmaterials:tungsten_nether_ore", - "ftbmaterials:tungsten_block", + "ftbmaterials:tungsten_stone_ore", "ftbmaterials:titanium_deepslate_ore", - "ftbmaterials:titanium_stone_ore", + "ftbmaterials:titanium_block", "ftbmaterials:titanium_raw_block", "ftbmaterials:titanium_end_ore", "ftbmaterials:titanium_nether_ore", - "ftbmaterials:titanium_block", + "ftbmaterials:titanium_stone_ore", "ftbmaterials:platinum_deepslate_ore", - "ftbmaterials:platinum_stone_ore", + "ftbmaterials:platinum_block", "ftbmaterials:platinum_raw_block", "ftbmaterials:platinum_end_ore", "ftbmaterials:platinum_nether_ore", - "ftbmaterials:platinum_block", + "ftbmaterials:platinum_stone_ore", "ftbmaterials:stainless_steel_block", - "ftbmaterials:plutonium_raw_block", "ftbmaterials:plutonium_block", - "ftbmaterials:chromium_raw_block", + "ftbmaterials:plutonium_raw_block", "ftbmaterials:chromium_block", - "ftbmaterials:silicon_raw_block", + "ftbmaterials:chromium_raw_block", "ftbmaterials:silicon_block", - "ftbmaterials:brass_raw_block", - "ftbmaterials:brass_block" + "ftbmaterials:silicon_raw_block", + "ftbmaterials:brass_block", + "ftbmaterials:brass_raw_block" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json b/fabric/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json index b42c5fd..bd8fc6e 100644 --- a/fabric/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json +++ b/fabric/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json @@ -1,11 +1,11 @@ { "values": [ "ftbmaterials:aluminum_deepslate_ore", - "ftbmaterials:aluminum_stone_ore", + "ftbmaterials:aluminum_block", "ftbmaterials:aluminum_raw_block", "ftbmaterials:aluminum_end_ore", "ftbmaterials:aluminum_nether_ore", - "ftbmaterials:aluminum_block", + "ftbmaterials:aluminum_stone_ore", "ftbmaterials:apatite_block", "ftbmaterials:bronze_block", "ftbmaterials:constantan_block", @@ -21,127 +21,127 @@ "ftbmaterials:iron_end_ore", "ftbmaterials:iron_nether_ore", "ftbmaterials:lead_deepslate_ore", - "ftbmaterials:lead_stone_ore", + "ftbmaterials:lead_block", "ftbmaterials:lead_raw_block", "ftbmaterials:lead_end_ore", "ftbmaterials:lead_nether_ore", - "ftbmaterials:lead_block", + "ftbmaterials:lead_stone_ore", "ftbmaterials:lumium_block", "ftbmaterials:nickel_deepslate_ore", - "ftbmaterials:nickel_stone_ore", + "ftbmaterials:nickel_block", "ftbmaterials:nickel_raw_block", "ftbmaterials:nickel_end_ore", "ftbmaterials:nickel_nether_ore", - "ftbmaterials:nickel_block", + "ftbmaterials:nickel_stone_ore", "ftbmaterials:osmium_deepslate_ore", - "ftbmaterials:osmium_stone_ore", + "ftbmaterials:osmium_block", "ftbmaterials:osmium_raw_block", "ftbmaterials:osmium_end_ore", "ftbmaterials:osmium_nether_ore", - "ftbmaterials:osmium_block", - "ftbmaterials:quartz_end_ore", + "ftbmaterials:osmium_stone_ore", "ftbmaterials:quartz_deepslate_ore", + "ftbmaterials:quartz_end_ore", "ftbmaterials:quartz_stone_ore", "ftbmaterials:refined_glowstone_block", "ftbmaterials:silver_deepslate_ore", - "ftbmaterials:silver_stone_ore", + "ftbmaterials:silver_block", "ftbmaterials:silver_raw_block", "ftbmaterials:silver_end_ore", "ftbmaterials:silver_nether_ore", - "ftbmaterials:silver_block", + "ftbmaterials:silver_stone_ore", "ftbmaterials:steel_block", - "ftbmaterials:sulfur_end_ore", "ftbmaterials:sulfur_deepslate_ore", - "ftbmaterials:sulfur_stone_ore", + "ftbmaterials:sulfur_end_ore", "ftbmaterials:sulfur_nether_ore", + "ftbmaterials:sulfur_stone_ore", "ftbmaterials:sulfur_block", "ftbmaterials:tin_deepslate_ore", - "ftbmaterials:tin_stone_ore", + "ftbmaterials:tin_block", "ftbmaterials:tin_raw_block", "ftbmaterials:tin_end_ore", "ftbmaterials:tin_nether_ore", - "ftbmaterials:tin_block", + "ftbmaterials:tin_stone_ore", "ftbmaterials:uranium_deepslate_ore", - "ftbmaterials:uranium_stone_ore", + "ftbmaterials:uranium_block", "ftbmaterials:uranium_raw_block", "ftbmaterials:uranium_end_ore", "ftbmaterials:uranium_nether_ore", - "ftbmaterials:uranium_block", + "ftbmaterials:uranium_stone_ore", "ftbmaterials:zinc_deepslate_ore", - "ftbmaterials:zinc_stone_ore", + "ftbmaterials:zinc_block", "ftbmaterials:zinc_raw_block", "ftbmaterials:zinc_end_ore", "ftbmaterials:zinc_nether_ore", - "ftbmaterials:zinc_block", + "ftbmaterials:zinc_stone_ore", "ftbmaterials:redstone_end_ore", "ftbmaterials:redstone_nether_ore", - "ftbmaterials:fluorite_end_ore", "ftbmaterials:fluorite_deepslate_ore", - "ftbmaterials:fluorite_stone_ore", + "ftbmaterials:fluorite_end_ore", "ftbmaterials:fluorite_nether_ore", + "ftbmaterials:fluorite_stone_ore", "ftbmaterials:fluorite_block", "ftbmaterials:emerald_end_ore", "ftbmaterials:emerald_nether_ore", "ftbmaterials:lapis_lazuli_end_ore", "ftbmaterials:lapis_lazuli_nether_ore", - "ftbmaterials:resonating_ore_end_ore", "ftbmaterials:resonating_ore_deepslate_ore", - "ftbmaterials:resonating_ore_stone_ore", + "ftbmaterials:resonating_ore_end_ore", "ftbmaterials:resonating_ore_nether_ore", + "ftbmaterials:resonating_ore_stone_ore", "ftbmaterials:resonating_ore_block", - "ftbmaterials:dimensional_shard_end_ore", "ftbmaterials:dimensional_shard_deepslate_ore", - "ftbmaterials:dimensional_shard_stone_ore", + "ftbmaterials:dimensional_shard_end_ore", "ftbmaterials:dimensional_shard_nether_ore", + "ftbmaterials:dimensional_shard_stone_ore", "ftbmaterials:dimensional_shard_block", "ftbmaterials:antimony_deepslate_ore", - "ftbmaterials:antimony_stone_ore", + "ftbmaterials:antimony_block", "ftbmaterials:antimony_raw_block", "ftbmaterials:antimony_end_ore", "ftbmaterials:antimony_nether_ore", - "ftbmaterials:antimony_block", - "ftbmaterials:bauxite_end_ore", + "ftbmaterials:antimony_stone_ore", "ftbmaterials:bauxite_deepslate_ore", - "ftbmaterials:bauxite_stone_ore", + "ftbmaterials:bauxite_end_ore", "ftbmaterials:bauxite_nether_ore", + "ftbmaterials:bauxite_stone_ore", "ftbmaterials:bauxite_block", "ftbmaterials:iridium_deepslate_ore", - "ftbmaterials:iridium_stone_ore", + "ftbmaterials:iridium_block", "ftbmaterials:iridium_raw_block", "ftbmaterials:iridium_end_ore", "ftbmaterials:iridium_nether_ore", - "ftbmaterials:iridium_block", - "ftbmaterials:monazite_end_ore", + "ftbmaterials:iridium_stone_ore", "ftbmaterials:monazite_deepslate_ore", - "ftbmaterials:monazite_stone_ore", + "ftbmaterials:monazite_end_ore", "ftbmaterials:monazite_nether_ore", + "ftbmaterials:monazite_stone_ore", "ftbmaterials:monazite_block", "ftbmaterials:tungsten_deepslate_ore", - "ftbmaterials:tungsten_stone_ore", + "ftbmaterials:tungsten_block", "ftbmaterials:tungsten_raw_block", "ftbmaterials:tungsten_end_ore", "ftbmaterials:tungsten_nether_ore", - "ftbmaterials:tungsten_block", + "ftbmaterials:tungsten_stone_ore", "ftbmaterials:titanium_deepslate_ore", - "ftbmaterials:titanium_stone_ore", + "ftbmaterials:titanium_block", "ftbmaterials:titanium_raw_block", "ftbmaterials:titanium_end_ore", "ftbmaterials:titanium_nether_ore", - "ftbmaterials:titanium_block", + "ftbmaterials:titanium_stone_ore", "ftbmaterials:platinum_deepslate_ore", - "ftbmaterials:platinum_stone_ore", + "ftbmaterials:platinum_block", "ftbmaterials:platinum_raw_block", "ftbmaterials:platinum_end_ore", "ftbmaterials:platinum_nether_ore", - "ftbmaterials:platinum_block", + "ftbmaterials:platinum_stone_ore", "ftbmaterials:stainless_steel_block", - "ftbmaterials:plutonium_raw_block", "ftbmaterials:plutonium_block", - "ftbmaterials:chromium_raw_block", + "ftbmaterials:plutonium_raw_block", "ftbmaterials:chromium_block", - "ftbmaterials:silicon_raw_block", + "ftbmaterials:chromium_raw_block", "ftbmaterials:silicon_block", - "ftbmaterials:brass_raw_block", - "ftbmaterials:brass_block" + "ftbmaterials:silicon_raw_block", + "ftbmaterials:brass_block", + "ftbmaterials:brass_raw_block" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/minecraft/tags/block/needs_iron_tool.json b/fabric/src/main/generated/data/minecraft/tags/block/needs_iron_tool.json index 7a9c78e..2f2fd59 100644 --- a/fabric/src/main/generated/data/minecraft/tags/block/needs_iron_tool.json +++ b/fabric/src/main/generated/data/minecraft/tags/block/needs_iron_tool.json @@ -9,10 +9,10 @@ "ftbmaterials:redstone_nether_ore", "ftbmaterials:emerald_end_ore", "ftbmaterials:emerald_nether_ore", - "ftbmaterials:dimensional_shard_end_ore", "ftbmaterials:dimensional_shard_deepslate_ore", - "ftbmaterials:dimensional_shard_stone_ore", + "ftbmaterials:dimensional_shard_end_ore", "ftbmaterials:dimensional_shard_nether_ore", + "ftbmaterials:dimensional_shard_stone_ore", "ftbmaterials:dimensional_shard_block" ] } \ No newline at end of file diff --git a/fabric/src/main/generated/data/minecraft/tags/block/needs_stone_tool.json b/fabric/src/main/generated/data/minecraft/tags/block/needs_stone_tool.json index 24cd030..cd05601 100644 --- a/fabric/src/main/generated/data/minecraft/tags/block/needs_stone_tool.json +++ b/fabric/src/main/generated/data/minecraft/tags/block/needs_stone_tool.json @@ -1,11 +1,11 @@ { "values": [ "ftbmaterials:aluminum_deepslate_ore", - "ftbmaterials:aluminum_stone_ore", + "ftbmaterials:aluminum_block", "ftbmaterials:aluminum_raw_block", "ftbmaterials:aluminum_end_ore", "ftbmaterials:aluminum_nether_ore", - "ftbmaterials:aluminum_block", + "ftbmaterials:aluminum_stone_ore", "ftbmaterials:apatite_block", "ftbmaterials:bronze_block", "ftbmaterials:constantan_block", @@ -16,118 +16,118 @@ "ftbmaterials:iron_end_ore", "ftbmaterials:iron_nether_ore", "ftbmaterials:lead_deepslate_ore", - "ftbmaterials:lead_stone_ore", + "ftbmaterials:lead_block", "ftbmaterials:lead_raw_block", "ftbmaterials:lead_end_ore", "ftbmaterials:lead_nether_ore", - "ftbmaterials:lead_block", + "ftbmaterials:lead_stone_ore", "ftbmaterials:lumium_block", "ftbmaterials:nickel_deepslate_ore", - "ftbmaterials:nickel_stone_ore", + "ftbmaterials:nickel_block", "ftbmaterials:nickel_raw_block", "ftbmaterials:nickel_end_ore", "ftbmaterials:nickel_nether_ore", - "ftbmaterials:nickel_block", + "ftbmaterials:nickel_stone_ore", "ftbmaterials:osmium_deepslate_ore", - "ftbmaterials:osmium_stone_ore", + "ftbmaterials:osmium_block", "ftbmaterials:osmium_raw_block", "ftbmaterials:osmium_end_ore", "ftbmaterials:osmium_nether_ore", - "ftbmaterials:osmium_block", - "ftbmaterials:quartz_end_ore", + "ftbmaterials:osmium_stone_ore", "ftbmaterials:quartz_deepslate_ore", + "ftbmaterials:quartz_end_ore", "ftbmaterials:quartz_stone_ore", "ftbmaterials:refined_glowstone_block", "ftbmaterials:silver_deepslate_ore", - "ftbmaterials:silver_stone_ore", + "ftbmaterials:silver_block", "ftbmaterials:silver_raw_block", "ftbmaterials:silver_end_ore", "ftbmaterials:silver_nether_ore", - "ftbmaterials:silver_block", + "ftbmaterials:silver_stone_ore", "ftbmaterials:steel_block", - "ftbmaterials:sulfur_end_ore", "ftbmaterials:sulfur_deepslate_ore", - "ftbmaterials:sulfur_stone_ore", + "ftbmaterials:sulfur_end_ore", "ftbmaterials:sulfur_nether_ore", + "ftbmaterials:sulfur_stone_ore", "ftbmaterials:sulfur_block", "ftbmaterials:tin_deepslate_ore", - "ftbmaterials:tin_stone_ore", + "ftbmaterials:tin_block", "ftbmaterials:tin_raw_block", "ftbmaterials:tin_end_ore", "ftbmaterials:tin_nether_ore", - "ftbmaterials:tin_block", + "ftbmaterials:tin_stone_ore", "ftbmaterials:uranium_deepslate_ore", - "ftbmaterials:uranium_stone_ore", + "ftbmaterials:uranium_block", "ftbmaterials:uranium_raw_block", "ftbmaterials:uranium_end_ore", "ftbmaterials:uranium_nether_ore", - "ftbmaterials:uranium_block", + "ftbmaterials:uranium_stone_ore", "ftbmaterials:zinc_deepslate_ore", - "ftbmaterials:zinc_stone_ore", + "ftbmaterials:zinc_block", "ftbmaterials:zinc_raw_block", "ftbmaterials:zinc_end_ore", "ftbmaterials:zinc_nether_ore", - "ftbmaterials:zinc_block", - "ftbmaterials:fluorite_end_ore", + "ftbmaterials:zinc_stone_ore", "ftbmaterials:fluorite_deepslate_ore", - "ftbmaterials:fluorite_stone_ore", + "ftbmaterials:fluorite_end_ore", "ftbmaterials:fluorite_nether_ore", + "ftbmaterials:fluorite_stone_ore", "ftbmaterials:fluorite_block", "ftbmaterials:lapis_lazuli_end_ore", "ftbmaterials:lapis_lazuli_nether_ore", - "ftbmaterials:resonating_ore_end_ore", "ftbmaterials:resonating_ore_deepslate_ore", - "ftbmaterials:resonating_ore_stone_ore", + "ftbmaterials:resonating_ore_end_ore", "ftbmaterials:resonating_ore_nether_ore", + "ftbmaterials:resonating_ore_stone_ore", "ftbmaterials:resonating_ore_block", "ftbmaterials:antimony_deepslate_ore", - "ftbmaterials:antimony_stone_ore", + "ftbmaterials:antimony_block", "ftbmaterials:antimony_raw_block", "ftbmaterials:antimony_end_ore", "ftbmaterials:antimony_nether_ore", - "ftbmaterials:antimony_block", - "ftbmaterials:bauxite_end_ore", + "ftbmaterials:antimony_stone_ore", "ftbmaterials:bauxite_deepslate_ore", - "ftbmaterials:bauxite_stone_ore", + "ftbmaterials:bauxite_end_ore", "ftbmaterials:bauxite_nether_ore", + "ftbmaterials:bauxite_stone_ore", "ftbmaterials:bauxite_block", "ftbmaterials:iridium_deepslate_ore", - "ftbmaterials:iridium_stone_ore", + "ftbmaterials:iridium_block", "ftbmaterials:iridium_raw_block", "ftbmaterials:iridium_end_ore", "ftbmaterials:iridium_nether_ore", - "ftbmaterials:iridium_block", - "ftbmaterials:monazite_end_ore", + "ftbmaterials:iridium_stone_ore", "ftbmaterials:monazite_deepslate_ore", - "ftbmaterials:monazite_stone_ore", + "ftbmaterials:monazite_end_ore", "ftbmaterials:monazite_nether_ore", + "ftbmaterials:monazite_stone_ore", "ftbmaterials:monazite_block", "ftbmaterials:tungsten_deepslate_ore", - "ftbmaterials:tungsten_stone_ore", + "ftbmaterials:tungsten_block", "ftbmaterials:tungsten_raw_block", "ftbmaterials:tungsten_end_ore", "ftbmaterials:tungsten_nether_ore", - "ftbmaterials:tungsten_block", + "ftbmaterials:tungsten_stone_ore", "ftbmaterials:titanium_deepslate_ore", - "ftbmaterials:titanium_stone_ore", + "ftbmaterials:titanium_block", "ftbmaterials:titanium_raw_block", "ftbmaterials:titanium_end_ore", "ftbmaterials:titanium_nether_ore", - "ftbmaterials:titanium_block", + "ftbmaterials:titanium_stone_ore", "ftbmaterials:platinum_deepslate_ore", - "ftbmaterials:platinum_stone_ore", + "ftbmaterials:platinum_block", "ftbmaterials:platinum_raw_block", "ftbmaterials:platinum_end_ore", "ftbmaterials:platinum_nether_ore", - "ftbmaterials:platinum_block", + "ftbmaterials:platinum_stone_ore", "ftbmaterials:stainless_steel_block", - "ftbmaterials:plutonium_raw_block", "ftbmaterials:plutonium_block", - "ftbmaterials:chromium_raw_block", + "ftbmaterials:plutonium_raw_block", "ftbmaterials:chromium_block", - "ftbmaterials:silicon_raw_block", + "ftbmaterials:chromium_raw_block", "ftbmaterials:silicon_block", - "ftbmaterials:brass_raw_block", - "ftbmaterials:brass_block" + "ftbmaterials:silicon_raw_block", + "ftbmaterials:brass_block", + "ftbmaterials:brass_raw_block" ] } \ No newline at end of file diff --git a/fabric/src/main/java/dev/ftb/mods/ftbmaterials/fabric/data/LootTableGenerator.java b/fabric/src/main/java/dev/ftb/mods/ftbmaterials/fabric/data/LootTableGenerator.java index 7d26521..8bb89c8 100644 --- a/fabric/src/main/java/dev/ftb/mods/ftbmaterials/fabric/data/LootTableGenerator.java +++ b/fabric/src/main/java/dev/ftb/mods/ftbmaterials/fabric/data/LootTableGenerator.java @@ -1,5 +1,7 @@ package dev.ftb.mods.ftbmaterials.fabric.data; +import dev.architectury.registry.registries.RegistrySupplier; +import dev.ftb.mods.ftbmaterials.resources.Resource; import dev.ftb.mods.ftbmaterials.resources.ResourceRegistry; import dev.ftb.mods.ftbmaterials.resources.ResourceRegistryHolder; import dev.ftb.mods.ftbmaterials.resources.ResourceType; @@ -8,10 +10,11 @@ import net.fabricmc.fabric.api.datagen.v1.provider.FabricBlockLootTableProvider; import net.minecraft.core.HolderLookup; import net.minecraft.world.item.Item; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.block.Block; -import java.util.ArrayList; -import java.util.List; +import java.util.*; import java.util.concurrent.CompletableFuture; public class LootTableGenerator extends FabricBlockLootTableProvider { @@ -29,6 +32,34 @@ public void generate() { } addSelfDropsForResourceTypes(ResourceType.BLOCK, ResourceType.RAW_BLOCK); + + // Drops something from vanilla. This means we can't do the normal one + // Ore drops special case + Map>, ItemLike> oreBlocks = new HashMap<>() {{ + put(findBlockFromTypeAndComponent(Resource.EMERALD, ResourceType.END_ORE), Items.EMERALD); + put(findBlockFromTypeAndComponent(Resource.DIAMOND, ResourceType.END_ORE), Items.DIAMOND); + put(findBlockFromTypeAndComponent(Resource.LAPIS_LAZULI, ResourceType.END_ORE), Items.LAPIS_LAZULI); + put(findBlockFromTypeAndComponent(Resource.REDSTONE, ResourceType.END_ORE), Items.REDSTONE); + put(findBlockFromTypeAndComponent(Resource.IRON, ResourceType.END_ORE), Items.RAW_IRON); + put(findBlockFromTypeAndComponent(Resource.GOLD, ResourceType.END_ORE), Items.RAW_GOLD); + put(findBlockFromTypeAndComponent(Resource.COPPER, ResourceType.END_ORE), Items.RAW_COPPER); + put(findBlockFromTypeAndComponent(Resource.QUARTZ, ResourceType.END_ORE), Items.QUARTZ); + put(findBlockFromTypeAndComponent(Resource.EMERALD, ResourceType.NETHER_ORE), Items.EMERALD); + put(findBlockFromTypeAndComponent(Resource.DIAMOND, ResourceType.NETHER_ORE), Items.DIAMOND); + put(findBlockFromTypeAndComponent(Resource.LAPIS_LAZULI, ResourceType.NETHER_ORE), Items.LAPIS_LAZULI); + put(findBlockFromTypeAndComponent(Resource.REDSTONE, ResourceType.NETHER_ORE), Items.REDSTONE); + put(findBlockFromTypeAndComponent(Resource.IRON, ResourceType.NETHER_ORE), Items.RAW_IRON); + put(findBlockFromTypeAndComponent(Resource.GOLD, ResourceType.NETHER_ORE), Items.RAW_GOLD); + put(findBlockFromTypeAndComponent(Resource.COPPER, ResourceType.NETHER_ORE), Items.RAW_COPPER); + }}; + + for (var entry : oreBlocks.entrySet()) { + if (entry.getKey().isEmpty()) { + continue; + } + + add(entry.getKey().get().get(), createOreDrop(entry.getKey().get().get(), entry.getValue().asItem())); + } } private List> seekBlocksWithOreItem(ResourceType type) { @@ -65,4 +96,14 @@ private void addSelfDropsForResourceTypes(ResourceType ...types) { } } } + + private Optional> findBlockFromTypeAndComponent(Resource type, ResourceType component) { + for (ResourceRegistryHolder holder : ResourceRegistry.RESOURCE_REGISTRY_HOLDERS) { + if (holder.getType() == type) { + return holder.getBlockFromType(component); + } + } + + return Optional.empty(); + } } diff --git a/gradle.properties b/gradle.properties index 664c0cf..885e66a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx2G org.gradle.parallel=true # Mod properties -mod_version = 21.1.0-beta.1 +mod_version = 21.1.0-beta.2 maven_group = dev.ftb.mods archives_name = ftbmaterials enabled_platforms = fabric,neoforge