mirror of
https://github.com/Ellpeck/ActuallyAdditions.git
synced 2024-11-21 15:03:30 +01:00
Prepping for merge.
This commit is contained in:
Flanks255
parent
7fd9c103fc
commit
606177d002
3 changed files with 117 additions and 54 deletions
|
|
@ -1,64 +1,64 @@
|
|||
#Because he's me
|
||||
ellpeck=actuallyadditions:atomic_reconstructor
|
||||
ellpeck=actuallyadditions:blockAtomicReconstructor
|
||||
#Because he submitted tons of ideas for the mod
|
||||
dqmhose=minecraft:torch
|
||||
#Because he does all of the textures
|
||||
twoofeight=actuallyadditions:heat_collector
|
||||
twoofeight=actuallyadditions:blockHeatCollector
|
||||
#Because she is awesome and squids are cool
|
||||
larixine=actuallyadditions:black_crystal_shard
|
||||
larixine=actuallyadditions:blockBlackLotus
|
||||
#Because he helps me with models and stuff
|
||||
canitzp=actuallyadditions:coffee_machine_block
|
||||
canitzp=actuallyadditions:blockCoffeeMachine
|
||||
#Because he's an awesome guy and helps with lots of stuff
|
||||
xdjackiexd=actuallyadditions:drill_white
|
||||
xdjackiexd=actuallyadditions:itemDrill@14
|
||||
#Because worms
|
||||
bootytoast=actuallyadditions:worm
|
||||
bootytoast=actuallyadditions:itemWorm
|
||||
#Because he does the ActAdd doc on the FTB Wiki
|
||||
xbony2=actuallyadditions:booklet
|
||||
xbony2=actuallyadditions:itemBooklet
|
||||
|
||||
#Patreon stuff
|
||||
# 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
|
||||
The_Boo=actuallyadditions:empowered_diamatine_crystal
|
||||
Cloniart47=actuallyadditions:diamatine_crystal
|
||||
kei_kouma=actuallyadditions:enori_crystal
|
||||
kingofaces2=actuallyadditions:emeradic_crystal
|
||||
Sharkbite202020=actuallyadditions:empowered_emeradic_crystal
|
||||
ArcticPrince=actuallyadditions:phantom_itemface
|
||||
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
|
||||
DJAscendance=actuallyadditions:itemCrystal@2
|
||||
SneezySchoo=actuallyadditions:itemCrystal@0
|
||||
Mistakin=actuallyadditions:itemCrystal@3
|
||||
Tonitch8=actuallyadditions:itemCrystal@4
|
||||
Owlwix=actuallyadditions:itemCrystalEmpowered@5
|
||||
3MJoey=actuallyadditions:itemCrystal@1
|
||||
Ridanis=actuallyadditions:itemHairyBall@0
|
||||
gefailter71=actuallyadditions:itemCrystalEmpowered@0
|
||||
SeaSaltStar=actuallyadditions:itemCrystal@0
|
||||
VlaDracul3=actuallyadditions:itemCrystal@4
|
||||
slbsh=actuallyadditions:itemCrystalEmpowered@0
|
||||
WolfgalVlad=actuallyadditions:itemCrystalEmpowered@2
|
||||
Water_Moon=actuallyadditions:blockPhantomBooster@0
|
||||
ticticboi=actuallyadditions:itemCrystalEmpowered@2
|
||||
The_Boo=actuallyadditions:itemCrystalEmpowered@3
|
||||
Cloniart47=actuallyadditions:itemCrystal@2
|
||||
kei_kouma=actuallyadditions:itemCrystal@5
|
||||
kingofaces2=actuallyadditions:itemCrystal@4
|
||||
Sharkbite202020=actuallyadditions:itemCrystalEmpowered@4
|
||||
ArcticPrince=actuallyadditions:blockPhantomface
|
||||
64
specialPeopleThings.properties
Normal file
64
specialPeopleThings.properties
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
#Because he's me
|
||||
ellpeck=actuallyadditions:atomic_reconstructor
|
||||
#Because he submitted tons of ideas for the mod
|
||||
dqmhose=minecraft:torch
|
||||
#Because he does all of the textures
|
||||
twoofeight=actuallyadditions:heat_collector
|
||||
#Because she is awesome and squids are cool
|
||||
larixine=actuallyadditions:black_crystal_shard
|
||||
#Because he helps me with models and stuff
|
||||
canitzp=actuallyadditions:coffee_machine_block
|
||||
#Because he's an awesome guy and helps with lots of stuff
|
||||
xdjackiexd=actuallyadditions:drill_white
|
||||
#Because worms
|
||||
bootytoast=actuallyadditions:worm
|
||||
#Because he does the ActAdd doc on the FTB Wiki
|
||||
xbony2=actuallyadditions:booklet
|
||||
|
||||
#Patreon stuff
|
||||
# 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
|
||||
slbsh=actuallyadditions:empowered_restonia_crystal
|
||||
WolfgalVlad=actuallyadditions:empowered_diamatine_crystal
|
||||
Water_Moon=actuallyadditions:phantom_booster
|
||||
ticticboi=actuallyadditions:empowered_diamatine_crystal
|
||||
The_Boo=actuallyadditions:empowered_diamatine_crystal
|
||||
Cloniart47=actuallyadditions:diamatine_crystal
|
||||
kei_kouma=actuallyadditions:enori_crystal
|
||||
kingofaces2=actuallyadditions:emeradic_crystal
|
||||
Sharkbite202020=actuallyadditions:empowered_emeradic_crystal
|
||||
ArcticPrince=actuallyadditions:phantom_itemface
|
||||
|
|
@ -28,8 +28,7 @@ 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/1.20.4/specialPeopleStuff.properties");
|
||||
URL url = new URL("https://raw.githubusercontent.com/Ellpeck/ActuallyAdditions/main/specialPeopleThings.properties");
|
||||
Properties specialProperties = new Properties();
|
||||
specialProperties.load(new InputStreamReader(url.openStream()));
|
||||
SpecialRenderInit.parse(specialProperties);
|
||||
|
|
|
|||
Loading…
Reference in a new issue