Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pls ignore i did a mess #268

Closed
wants to merge 256 commits into from
Closed

pls ignore i did a mess #268

wants to merge 256 commits into from

Conversation

ethanicusss
Copy link
Collaborator

This PR aims to:

  • Replace a whole load of structures
  • Confine structures to unique biomes so we will have NO CLASHING!!
  • Cleanup the whole Astralrails datapack. Everything in proper folders and with proper naming

ToDo:

  • Proper folder structure for Structures, Structure sets, Configured Structure Features
  • Lay out structures to be rebuilt in Dev Server
  • Rebuild those structures
  • Export into newly cleaned Astralrails datapack
  • Plonk ALL structures into spreadsheet
  • Investigate which structures are clashing
  • Mitigate

Laskyyy added 30 commits February 27, 2023 16:47
@Laskyyy
Create a few new resources
45d591d
@Laskyyy
Update server.js
c49117d
@Laskyyy
Update Lang file
d278cd7
@Laskyyy
Commit some datapack resources + yttrium crushed tex
830201a
@Laskyyy
Squashed commit of the following:
6622ce3 
commit e90955f
Merge: 4870b1e a664566
Author: Jake <[email protected]>
Date:   Mon Feb 27 16:20:05 2023 +0000

    Merge branch 'main' of https://github.com/Laskyyy/Create-Astral

commit 4870b1e
Author: Jake <[email protected]>
Date:   Mon Feb 27 16:19:38 2023 +0000

    Remove Lunarian Wanderers + Remove Modded villager trades

commit a664566
Merge: 9c43a7a 2d54c19
Author: Laskyyy <[email protected]>
Date:   Mon Feb 27 16:08:45 2023 +0000

    Merge pull request #24 from spaceskynet/main

    Update startup.js and Fix ftb quests localization keys

commit 2d54c19
Author: SpaceSkyNet <[email protected]>
Date:   Mon Feb 27 21:58:56 2023 +0800

    Update startup.js + Fix ftb quests localization

commit 9c43a7a
Author: Jake <[email protected]>
Date:   Sat Feb 25 22:10:30 2023 +0000

    Update en_us.json

commit 72babd7
Author: Jake <[email protected]>
Date:   Sat Feb 25 14:13:44 2023 +0000

    Oxygen Distributor Rework + Electrolyser synergy

    Lowered block check frequency heavily preserve tps
    Increase max oxygen coverage
    Distributor uses more energy but wayyyy less oxygen
    Electrolyser Produces enough for one to be stable with an almost full capacity distributor

commit cd34279
Author: Jake <[email protected]>
Date:   Sat Feb 25 12:27:08 2023 +0000

    ThermalGen buff + Accumulator energy capacity

commit c30bd1d
Author: Jake <[email protected]>
Date:   Sat Feb 25 12:22:23 2023 +0000

    MFE / MFSU recipes fixed

commit ce30a04
Author: Jake <[email protected]>
Date:   Fri Feb 24 23:52:07 2023 +0000

    Techreborn tex shadowing

commit 75b91b7
Author: Jake <[email protected]>
Date:   Fri Feb 24 23:48:09 2023 +0000

    Electrolyser asset

commit c21a4af
Author: Jake <[email protected]>
Date:   Fri Feb 24 23:46:51 2023 +0000

    Electrolyser placeholder tex replaced

commit 384fe74
Author: Jake <[email protected]>
Date:   Fri Feb 24 22:21:05 2023 +0000

    Introduce planet-themed textures + localisation for techreborn ores

commit a32f853
Author: Jake <[email protected]>
Date:   Thu Feb 23 23:49:03 2023 +0000

    Jamiscus Arrow Retexture

commit 9d96784
Author: Jake <[email protected]>
Date:   Thu Feb 23 23:37:34 2023 +0000

    Integrate Dave's Building Extended with new recipe ingredient in place of steel.
@Laskyyy
Shadow Steel changes
da0be59
@Laskyyy
Add some compat, change merc orbit biome, new texture
038fbc8
@Laskyyy
Merge branch 'main' into Astral-Experimental
50bf28a
@Laskyyy
Fix ostrum oregen
125ef3e
@Laskyyy
Foundation for implementing two new multiblocks + processes
bf5eec8
@Laskyyy
Two new moon structures
4c57bbf
@Laskyyy
Fuel
39e20b2
@Laskyyy
Ae2 skystone ---> Ad astra skystone
5187a2b 
Added compat conversion recipe to make old worlds compat.
@Laskyyy
Updated .nbt for new structures
f6cccc6
@Laskyyy
Update ImmAircraft and Astral Vinery
e3bb5ea
@Laskyyy
Change Lang for gear casts
fa0f56c
@Laskyyy
Rich soil --> Saltpeter
c0825af
@Laskyyy
Rework Chapter 4 Material progression
0a86402
@Laskyyy
AE2 Controllers no longer take an eternity to cast
44ee3c5
@Laskyyy
Update nitrodiesel.json
fe12157
@Laskyyy
Ostrum/calorite smelting
e59a765
@Laskyyy
Shadow / Radiant fluid
46db787
@Laskyyy
Accelerated Leaf Decay
fbac8e7
@Laskyyy
Update LICENSE.md
234800c
@Laskyyy
Create immediatelyfast.pw.toml
bded97a
@Laskyyy
Edits to moon reactors to make them mimic the aesthetic of our other …
f0742a9 
…structures
@Laskyyy
Aurorite Related Processing
d6ae67d
@Laskyyy
Add FTBChunks + Journeymap Integration, remove Xaero's
8063dbf
@Laskyyy
FTBbackups
e42ad72
@Laskyyy
Update ftbbackups2.json
f7524e1
@ethanicusss
Update powerplant_origin.json
2f916b3
@ethanicusss
Create powerplant.json
a4d546d
@ethanicusss
Create reactor_tank_bridge.json
7d3848c
@ethanicusss
Create reactor_tank.json
bb1d4b6
@ethanicusss
reactor re-jig
cecd588 
hope fully this doesn't break everything!
@ethanicusss
it didn't work! it will now
9016bcb
@ethanicusss
why isn't it workinggg
e748669
@ethanicusss
aaaa
46b3e50
@ethanicusss
pls
72689cc
@ethanicusss
Add files via upload
91487bd
@ethanicusss
if this works i'm going t
73f3377
@ethanicusss
back we go
90f3c32
@ethanicusss
meow
1163f40
@ethanicusss
weee!
38e4d92
@ethanicusss
debris but small, also processors!
618cc6b
@ethanicusss
Delete global_packs/required_data/AstralRails/data/astralrails/worldg…
aa0a214 
…en/template_pool/moon/nuclear/small_debris_3.nbt

oops wrong dir
@ethanicusss
Delete global_packs/required_data/AstralRails/data/astralrails/worldg…
7cb8b25 
…en/template_pool/moon/nuclear/small_debris_2.nbt

oops wrong dir
@ethanicusss
Delete global_packs/required_data/AstralRails/data/astralrails/worldg…
8b16c3c 
…en/template_pool/moon/nuclear/small_debris_1.nbt

oops wrong dir
@ethanicusss
Delete global_packs/required_data/AstralRails/data/astralrails/worldg…
cbae4c6 
…en/template_pool/moon/nuclear/reactor_tank_bridge.nbt

oops wrong dir
@ethanicusss
Delete global_packs/required_data/AstralRails/data/astralrails/worldg…
a7b6659 
…en/template_pool/moon/nuclear/powerplant_step_4.nbt

oops wrong dir
@ethanicusss
Delete global_packs/required_data/AstralRails/data/astralrails/worldg…
f65cd92 
…en/template_pool/moon/nuclear/powerplant_origin.nbt

oops wrong dir
@ethanicusss
2.1: the not structures update
8ef52ea
@ethanicusss
-Removed Trains
3bc9575
@ethanicusss
a tank.. full of wwhat?
50f03ae
@ethanicusss
lets find out!
66f9aa7 
added shimmer tank to nuclear pool as a 50/50 replacement. i think im done with this for now
@ethanicusss
Update powerplant.json
82a01ab 
minor tank_2 fix
@ethanicusss
update tank_2
5baa48f 
reduced the big pipes spawning
@ethanicusss ethanicusss changed the title 2.1 Structure pack revamp and cleanup 2.1 Structure pack revamp and cleanup (Someone please close this PR idk what I did) Jan 31, 2024
@Laskyyy Laskyyy closed this Jan 31, 2024
@ethanicusss ethanicusss changed the title 2.1 Structure pack revamp and cleanup (Someone please close this PR idk what I did) pls ignore i did a mess Jan 31, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.