diff --git a/specialPeopleStuff.properties b/specialPeopleStuff.properties index 2592ceb4e..43c6d2c74 100644 --- a/specialPeopleStuff.properties +++ b/specialPeopleStuff.properties @@ -1,43 +1,58 @@ #Because he's me -ellpeck=actuallyadditions:blockAtomicReconstructor +ellpeck=actuallyadditions:atomic_reconstructor_block #Because he submitted tons of ideas for the mod dqmhose=minecraft:torch #Because he does all of the textures twoofeight=actuallyadditions:blockHeatCollector #Because she is awesome and squids are cool -larixine=actuallyadditions:blockBlackLotus +larixine=actuallyadditions:black_crystal_shard #Because he helps me with models and stuff -canitzp=actuallyadditions:blockCoffeeMachine +canitzp=actuallyadditions:coffee_machine_block #Because he's an awesome guy and helps with lots of stuff -xdjackiexd=actuallyadditions:itemDrill@14 +xdjackiexd=actuallyadditions:drill_white #Because worms -bootytoast=actuallyadditions:itemWorm +bootytoast=actuallyadditions:worm #Because he does the ActAdd doc on the FTB Wiki -xbony2=actuallyadditions:itemBooklet +xbony2=actuallyadditions:booklet #Patreon stuff -ftog_thorgal=actuallyadditions:itemCrystal -minetechniker=actuallyadditions:itemCrystalEmpowered@2 -3pixel=actuallyadditions:itemMoreDamageLens -kirindave=actuallyadditions:itemCrystalEmpowered@3 -theonewhohunts=actuallyadditions:itemCrystalEmpowered@4 -garantiertnicht=actuallyadditions:itemFillingWand -heathcliff1998=actuallyadditions:itemCrystalEmpowered@4 -saphrym=actuallyadditions:itemCrystal@3 -lyxthegamer=actuallyadditions:itemCrystalEmpowered@4 -skedone=actuallyadditions:itemCrystalEmpowered@4 -r33s3s=actuallyadditions:itemCrystalEmpowered@2 -roadrunner116=actuallyadditions:itemCrystal@4 -albrechtboucher=actuallyadditions:itemCrystalEmpowered@2 -fobok=actuallyadditions:itemCrystal@4 -dankfrog=actuallyadditions:itemCrystalEmpowered@2 -deanwhufc=actuallyadditions:itemCrystalEmpowered@2 -witsend66=actuallyadditions:itemCrystalEmpowered@1 -broccoli_bob=actuallyadditions:itemCrystal@3 -dolinmyster=actuallyadditions:itemCrystalEmpowered@4 -savos_darkran=actuallyadditions:itemCrystal@4 -flanks255=actuallyadditions:itemCrystalEmpowered@3 -spectacular101=actuallyadditions:itemCrystal@5 -scottradish=actuallyadditions:itemCrystal -slothicornstudio=actuallyadditions:itemCrystalEmpowered@5 -mecharm=actuallyadditions:itemCrystal@5 +# 0 = Redstone, 1 = Lapis, 2 = Diamond, 3 = Coal, 4 = Emerald, 5 = Iron +ftog_thorgal=actuallyadditions:restonia_crystal +minetechniker=actuallyadditions:empowered_diamatine_crystal +3pixel=actuallyadditions:more_damage_lens +kirindave=actuallyadditions:empowered_void_crystal +theonewhohunts=actuallyadditions:empowered_emeradic_crystal +garantiertnicht=actuallyadditions:filling_wand +heathcliff1998=actuallyadditions:empowered_emeradic_crystal +saphrym=actuallyadditions:void_crystal +lyxthegamer=actuallyadditions:empowered_emeradic_crystal +skedone=actuallyadditions:empowered_emeradic_crystal +r33s3s=actuallyadditions:empowered_diamatine_crystal +roadrunner116=actuallyadditions:emeradic_crystal +albrechtboucher=actuallyadditions:empowered_diamatine_crystal +fobok=actuallyadditions:emeradic_crystal +dankfrog=actuallyadditions:empowered_diamatine_crystal +deanwhufc=actuallyadditions:empowered_diamatine_crystal +witsend66=actuallyadditions:empowered_palis_crystal +broccoli_bob=actuallyadditions:void_crystal +dolinmyster=actuallyadditions:empowered_emeradic_crystal +savos_darkran=actuallyadditions:emeradic_crystal +flanks255=actuallyadditions:empowered_void_crystal +spectacular101=actuallyadditions:enori_crystal +scottradish=actuallyadditions:restonia_crystal +slothicornstudio=actuallyadditions:empowered_enori_crystal +mecharm=actuallyadditions:enori_crystal +DJAscendance=actuallyadditions:diamatine_crystal +SneezySchoo=actuallyadditions:restonia_crystal +Mistakin=actuallyadditions:void_crystal +Tonitch8=actuallyadditions:emeradic_crystal +Owlwix=actuallyadditions:empowered_enori_crystal +3MJoey=actuallyadditions:palis_crystal +Ridanis=actuallyadditions:hairy_ball +gefailter71=actuallyadditions:empowered_restonia_crystal +SeaSaltStar=actuallyadditions:restonia_crystal +VlaDracul3=actuallyadditions:emeradic_crystal +Anthonys_Lab=actuallyadditions:empowered_restonia_crystal +WolfgalVlad=actuallyadditions:empowered_diamatine_crystal +Water_Moon=actuallyadditions:phantom_booster +ticticboi=actuallyadditions:empowered_diamatine_crystal \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/ThreadSpecialFetcher.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/ThreadSpecialFetcher.java index 121c0f377..a0bac26fc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/ThreadSpecialFetcher.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/ThreadSpecialFetcher.java @@ -10,12 +10,12 @@ package de.ellpeck.actuallyadditions.mod.misc.special; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; + import java.io.InputStreamReader; import java.net.URL; import java.util.Properties; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; - public class ThreadSpecialFetcher extends Thread { public ThreadSpecialFetcher() { @@ -28,7 +28,8 @@ public class ThreadSpecialFetcher extends Thread { public void run() { ActuallyAdditions.LOGGER.info("Fetching Special People Stuff..."); try { - URL url = new URL("https://raw.githubusercontent.com/Ellpeck/ActuallyAdditions/main/specialPeopleStuff.properties"); + //URL url = new URL("https://raw.githubusercontent.com/Ellpeck/ActuallyAdditions/main/specialPeopleStuff.properties"); + URL url = new URL("https://raw.githubusercontent.com/Ellpeck/ActuallyAdditions/1.16/specialPeopleStuff.properties"); Properties specialProperties = new Properties(); specialProperties.load(new InputStreamReader(url.openStream())); SpecialRenderInit.parse(specialProperties);