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.

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

Pulling down Official 1.12 #1

Open
wants to merge 352 commits into
base: 1.12
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
352 commits
Select commit Hold shift + click to select a range
127e326
Fix binary star proprerty assignment bug
voidsong-dragonfly Mar 22, 2021
ed43125
Remove unnecessary code in space station ID chip
voidsong-dragonfly Mar 22, 2021
cb361c4
Fix random excess machine code
voidsong-dragonfly Mar 22, 2021
91e8b55
Rename and move code to make more sense
voidsong-dragonfly Mar 22, 2021
d818d6a
Fix atmosphere handler plant handling so plants and gasses disappear
voidsong-dragonfly Mar 22, 2021
6977eb1
Hopefully fix hovercraft dismount bug
voidsong-dragonfly Mar 22, 2021
5ad5a20
Fix 'Woog' to 'Wood'
voidsong-dragonfly Mar 22, 2021
b4d33fd
Fix rocket blocks being valid anywhere
voidsong-dragonfly Mar 23, 2021
9252b4f
Remove mining drills from UVAs
voidsong-dragonfly Mar 23, 2021
b4638d6
Add more atmosphere consequences including fire
voidsong-dragonfly Mar 23, 2021
8829965
Fix fire being possible on airless worlds from atmosphere changes
voidsong-dragonfly Mar 23, 2021
33228d5
Fix asteroid skies not rendering black holes (fixes #1960 )
voidsong-dragonfly Mar 23, 2021
c681bd8
Add boolean for retrograde orbits - fixes #1953
voidsong-dragonfly Mar 23, 2021
82c6e24
Fix low oxygen not allowing combustion. (It does, after all, still ha…
voidsong-dragonfly Mar 23, 2021
daadda2
Implement per-planet customizable geode ores
zack-emmert Mar 23, 2021
0084603
Fix craters considerably - they're not _perfect_, but they're better …
voidsong-dragonfly Mar 23, 2021
cb353e8
Merge pull request #7 from zack-emmert/feature/multiblockmodels
voidsong-dragonfly Mar 23, 2021
c9834c4
Merge pull request #1 from Silfryi/feature/multiblockmodels
zack-emmert Mar 23, 2021
022cc13
Fix geodes being able to spawn on top of oceans
voidsong-dragonfly Mar 23, 2021
626bd28
Fix strange band in craters
voidsong-dragonfly Mar 23, 2021
54db1f2
Begin implementing per-planet crater ore replacements. Currently ther…
zack-emmert Mar 24, 2021
38dffad
Merge remote-tracking branch 'PwnageAR/feature/multiblockmodels' into…
voidsong-dragonfly Mar 24, 2021
235ef1c
Fix up crater generation and ore spawning from PR
voidsong-dragonfly Mar 24, 2021
790ef33
Fix AR blocks being rock when they should be metal
voidsong-dragonfly Mar 24, 2021
d1a0fcc
Rockets now glass and otherwise destroy vegitation and non-metal (roc…
voidsong-dragonfly Mar 24, 2021
e279d2a
Fix JEI ordering
voidsong-dragonfly Mar 24, 2021
3c91fe5
Update rocket blocks to be slightly less overbearing
voidsong-dragonfly Mar 24, 2021
58fa131
Fix once again rocket block destruction
voidsong-dragonfly Mar 24, 2021
5682954
Finish launching/landing block damage
voidsong-dragonfly Mar 24, 2021
6b6b7f4
More rocket launch fixes, this time use ground material instead of bl…
voidsong-dragonfly Mar 25, 2021
a95b4a7
Fix fuel loaders not being able to detect changes in bipropellant fue…
voidsong-dragonfly Mar 25, 2021
8ea20bf
Remove fluids other than lava being luminous
voidsong-dragonfly Mar 25, 2021
d941b25
Fix large deep swamp trees spawning with chunks missing
voidsong-dragonfly Mar 25, 2021
656d9fd
Fix entity interactions with gravity - fixes #1665
voidsong-dragonfly Mar 25, 2021
d222c20
Fix biome names being specified in the constructor
voidsong-dragonfly Mar 25, 2021
2ebe168
Reduce log errors
voidsong-dragonfly Mar 25, 2021
bdfdfff
Fix suit GUI rendering in spectator mode
voidsong-dragonfly Mar 25, 2021
85e824b
Add tooltip to small plate press about obsidian
voidsong-dragonfly Mar 25, 2021
34cc669
Remove useless unused bucket code
voidsong-dragonfly Mar 25, 2021
cdf20bc
Change seat recipe to be slightly less generic wool slab
voidsong-dragonfly Mar 25, 2021
f123193
Fix most entities not responding correctly to gravity changes
voidsong-dragonfly Mar 26, 2021
806bd75
Fix mislocalization
voidsong-dragonfly Mar 26, 2021
fd1ce93
Fix crash when players are in incorrect place in space, and put them …
voidsong-dragonfly Mar 26, 2021
deb980a
Fix CO2 scrubber deleting items on insert
voidsong-dragonfly Mar 26, 2021
bfdf4fc
Fix some cable code still being called, causing issues on some servers
voidsong-dragonfly Mar 26, 2021
a5e3d77
Fix other InventoryHatch descendants without proper I/O definitions
voidsong-dragonfly Mar 26, 2021
545bd7c
Fix cable handler crash I inadvertently caused
voidsong-dragonfly Mar 26, 2021
6477a13
Allow pressurized tank to interact with fluid contaniers outside its GUI
voidsong-dragonfly Mar 26, 2021
3c500e7
Misc. small fixes
voidsong-dragonfly Mar 28, 2021
11adda7
Undo cable code undo to fix transciever crash
voidsong-dragonfly Mar 28, 2021
9acd2ec
Add more model work
voidsong-dragonfly Mar 28, 2021
0890cd8
Rocket block models fixes
voidsong-dragonfly Mar 28, 2021
2ae3773
Remove unnecessary super callsx
voidsong-dragonfly Mar 28, 2021
7bcaead
Fix localizations
voidsong-dragonfly Mar 29, 2021
0e81bb8
Fix ore mapping satellites
voidsong-dragonfly Mar 29, 2021
41dab12
Fix sawblade model as well
voidsong-dragonfly Mar 29, 2021
7ec1af1
Fix station and asteroid chip having the same texture
voidsong-dragonfly Mar 29, 2021
54c5583
Fix planet name generation to take star name into account
voidsong-dragonfly Mar 29, 2021
8dd39ec
Small amount of grav handler fixes
voidsong-dragonfly Mar 29, 2021
6568951
Final gravity handler changes to properly support fluids
voidsong-dragonfly Mar 29, 2021
bc1b6d1
Fix ASM to place methods more appropriately
voidsong-dragonfly Mar 29, 2021
097966b
Reenable gravity performance code
voidsong-dragonfly Mar 29, 2021
e53e728
Add tank capacity multipliers
voidsong-dragonfly Mar 29, 2021
1b96ad8
Config cleanup
voidsong-dragonfly Mar 29, 2021
2e68c84
Deduplicate terraforming options
voidsong-dragonfly Mar 29, 2021
4d0daf6
Fix occasional crashes from int conversion
voidsong-dragonfly Mar 30, 2021
7045eb4
Fix NPE in satellite building code
voidsong-dragonfly Mar 30, 2021
197f92d
Fix fueling station fluid handling
voidsong-dragonfly Mar 30, 2021
c6bfdbd
Fix biome changer remote
voidsong-dragonfly Mar 31, 2021
4fa92f0
Fix satellite builder forcing parts in every slot
voidsong-dragonfly Mar 31, 2021
165c841
Merge branch 'Silfryi-feature/multiblockmodels' into 1.12
zmaster587 Apr 1, 2021
c59a5c4
Bump AR major version, THIS UPDATE WILL BREAK CONFIGS AND PLACED MACH…
zmaster587 Apr 1, 2021
5d8dd49
Fix solar array rendering problems
voidsong-dragonfly Apr 2, 2021
6e4df6b
Nuclear Thermal Rocket update!
voidsong-dragonfly Apr 5, 2021
6b1afce
Fix multiple fueling station bugs and clean up rocket code tremendously
voidsong-dragonfly Apr 8, 2021
95405b0
Fix missing return
voidsong-dragonfly Apr 8, 2021
0a2f9ad
Documentation update!
voidsong-dragonfly Apr 9, 2021
b6d9917
Rocket block damage changes and small fueling station fix
voidsong-dragonfly Apr 12, 2021
e9aa974
Fix satellite builder
voidsong-dragonfly Apr 12, 2021
4c8a396
Fix rocket fire placement
voidsong-dragonfly Apr 12, 2021
15bab97
Move checking range up one
voidsong-dragonfly Apr 12, 2021
90c1a21
Fix some space elevator errors
voidsong-dragonfly Apr 13, 2021
278ba31
Move covered text in space elevator UI
voidsong-dragonfly Apr 15, 2021
4e91def
Star warp fixes, fixes #1991 & possibly #1999
voidsong-dragonfly Apr 15, 2021
1305a5f
Fix players being booted out of ESF because they weren't in a station
voidsong-dragonfly Apr 16, 2021
2c6535a
Update README.md
dmodoomsirius Apr 22, 2021
df96cba
Fix double application of multiplier
voidsong-dragonfly Apr 23, 2021
6bee3dc
Fix misapplication of (int) because of parenthesis mishap
voidsong-dragonfly Apr 23, 2021
ac3ecc5
Fix incorrect simulation
voidsong-dragonfly Apr 23, 2021
d942141
add .github to 1.12 branch
dmodoomsirius Apr 28, 2021
0c0017b
Merge branch '1.12' of https://github.com/zmaster587/AdvancedRocketry…
dmodoomsirius Apr 28, 2021
ea9281e
Fix ClassCast problems with fluid blocks
voidsong-dragonfly May 6, 2021
b9bc80c
Fix solar array rendering problems (#2033)
voidsong-dragonfly May 8, 2021
93e6841
Fix problems with station player return system
voidsong-dragonfly May 8, 2021
e3f626c
fix missing deps.gradle
dmodoomsirius May 9, 2021
efed357
fix compiling issues
dmodoomsirius May 9, 2021
7b4705e
Add weights and crater biome weights
voidsong-dragonfly May 10, 2021
7d60a6e
First pass of a crater implementation with more randomness
voidsong-dragonfly May 11, 2021
7f62a42
Finalize crater generation with four sizes of crater that all kick in…
voidsong-dragonfly May 11, 2021
60efd60
More crater work, fewer overlapped craters and the addition of smalle…
voidsong-dragonfly May 11, 2021
5cbade0
Add river option, fixes #1954
voidsong-dragonfly May 11, 2021
9cf3308
i hate inversePartialSquareRadius so much right now but MapGenCraterH…
voidsong-dragonfly May 12, 2021
8503a3c
Fixes to small and medium crater generators as well. Hopefully I can …
voidsong-dragonfly May 12, 2021
ed36712
Hopefully revert to FG2.3 in a working way
voidsong-dragonfly May 13, 2021
619ccfc
Crater tweaks and volcano random radius additions
voidsong-dragonfly May 13, 2021
76358d5
Make crater ejecta start slightly larger to make biomes less messy
voidsong-dragonfly May 14, 2021
f3fadec
Fix NPE in rocket GUI code, fixes #2138
voidsong-dragonfly Jun 10, 2021
e358a6e
More minor crater fixes
voidsong-dragonfly Jun 10, 2021
3e30fbf
Fix gradle build (#2139)
Brycey92 Jun 11, 2021
5d9d2fe
Fix insolation being wrongly assigned due to early assignment and mad…
voidsong-dragonfly Jun 13, 2021
9eb205e
switch to dev builds of gc
dmodoomsirius Jun 10, 2020
83e033e
Update README.md
dmodoomsirius Apr 22, 2021
be40bbd
add .github to 1.12 branch
dmodoomsirius Apr 28, 2021
be82b85
Fix solar array rendering problems (#2033)
voidsong-dragonfly May 8, 2021
1ef19b8
fix missing deps.gradle
dmodoomsirius May 9, 2021
44074d5
fix compiling issues
dmodoomsirius May 9, 2021
181ba71
Hopefully revert to FG2.3 in a working way
voidsong-dragonfly May 13, 2021
12679db
Fix gradle build (#2139)
Brycey92 Jun 11, 2021
6affeb8
Add some methods for #1810 but not all of them.
voidsong-dragonfly Jun 14, 2021
6ace334
Final method for #1810
voidsong-dragonfly Jun 14, 2021
f9329d6
Massive code cleanup
Brycey92 Jun 13, 2021
9abb60b
Fix #784 by adding reset button to orientation controller
voidsong-dragonfly Jun 14, 2021
458c513
switch to dev builds of gc
dmodoomsirius Jun 10, 2020
36f011f
Update README.md
dmodoomsirius Apr 22, 2021
1e39d06
add .github to 1.12 branch
dmodoomsirius Apr 28, 2021
d1fa071
fix missing deps.gradle
dmodoomsirius May 9, 2021
6c9892d
fix compiling issues
dmodoomsirius May 9, 2021
1aa24d6
Hopefully revert to FG2.3 in a working way
voidsong-dragonfly May 13, 2021
8b790f2
Fix gradle build (#2139)
Brycey92 Jun 11, 2021
51e9c8e
API Code Cleanup
Brycey92 Jun 13, 2021
189de1e
Merge branch 'feature/nuclearthermalrockets' into 1.12-cleanup
voidsong-dragonfly Jun 14, 2021
22b9b7b
Another batch of IDEA-prompted changes
voidsong-dragonfly Jun 14, 2021
b0087df
Changes from "Massive code cleanup" code review
Brycey92 Jun 14, 2021
3eed9c2
Multiple bugfixes
voidsong-dragonfly Jun 14, 2021
d6ad5cf
Fix warp core
voidsong-dragonfly Jun 15, 2021
c36bb34
Fix planet gen NPE
voidsong-dragonfly Jun 15, 2021
6b26f79
Fix data bus issue
voidsong-dragonfly Jun 15, 2021
118058b
More fixes!
voidsong-dragonfly Jun 15, 2021
2f45d6b
First batch of fixes
voidsong-dragonfly Jun 15, 2021
de5808c
Second batch of fixes, with many IDEA mixups fixed
voidsong-dragonfly Jun 15, 2021
7c0d941
Merge branch '1.12-cleanup' into bryce_cleanup
voidsong-dragonfly Jun 15, 2021
1f68810
Merge pull request #1 from Silfryi/bryce_cleanup
Brycey92 Jun 15, 2021
4aec474
Downsize planet LEO textures and update lava color
voidsong-dragonfly Jun 15, 2021
fd13134
Add in cave generation boolean, fixes #2118
voidsong-dragonfly Jun 15, 2021
fc2d388
Merge branch 'feature/nuclearthermalrockets' into 1.12-cleanup
voidsong-dragonfly Jun 15, 2021
89ce7f3
Add in baseStack option for asteroids
voidsong-dragonfly Jun 15, 2021
de7f924
Attempt to fix FuelType NPE
Brycey92 Jun 15, 2021
9340e0b
Merge remote-tracking branch 'bryce/1.12-cleanup' into feature/nuclea…
voidsong-dragonfly Jun 15, 2021
1e8cf1e
Merge branch 'feature/nuclearthermalrockets' into 1.12-api-cleanup
Brycey92 Jun 15, 2021
5b2dce4
Merge pull request #9 from Brycey92/1.12-api-cleanup
voidsong-dragonfly Jun 15, 2021
06f1926
Fix flowing Enriched Lava looking like flowing oxygen
Brycey92 Jun 16, 2021
aaef518
Fix visual bugs with stars and planet shadows
Brycey92 Jun 16, 2021
3f70cdb
Allow all passable blocks to be used above seats
Brycey92 Jun 16, 2021
cc018f8
Multiple bugfixes and try to fix texture conflicts
voidsong-dragonfly Jun 16, 2021
7c634cf
More bugfixes
voidsong-dragonfly Jun 16, 2021
e4cb7f9
Merge branch 'feature/nuclearthermalrockets' of https://github.com/si…
voidsong-dragonfly Jun 16, 2021
1c6c5f1
Crater adjustments and rocket fixes, fixes #1360
voidsong-dragonfly Jun 17, 2021
6318b0a
Fix MP force field retraction stuck blocks bug
Brycey92 Jun 17, 2021
cccf801
Fix multiple bugs and revamp asteroid defaults
voidsong-dragonfly Jun 17, 2021
f208695
Fix NTR and other type fueling
voidsong-dragonfly Jun 17, 2021
aedb38c
Tiny code cleanup
Brycey92 Jun 17, 2021
62f7fc1
Fix Asteroid and Ore configs to work with comments
Brycey92 Jun 17, 2021
2d32c39
Make oxygen vent check top and bottom for scrubbers
Brycey92 Jun 18, 2021
6539716
Merge pull request #2 from Silfryi/feature/nuclearthermalrockets
Brycey92 Jun 18, 2021
3239048
Merge remote-tracking branch 'upstream/1.12' into 1.12-2.1.0-fixes-ba…
Brycey92 Jun 18, 2021
4e03406
Minor cleanup
Brycey92 Jun 18, 2021
d166e67
Fix model loading errors, warp controller NPE, rocket liftoff fire
voidsong-dragonfly Jun 18, 2021
784a6ae
Merge pull request #5 from Silfryi/feature/nuclearthermalrockets
Brycey92 Jun 18, 2021
ef95341
Fix #1945
voidsong-dragonfly Jun 18, 2021
5be5b9d
Fix AtmosphereHandler NPEs
Brycey92 Jun 19, 2021
b4f1b74
Merge remote-tracking branch 'sil/feature/nuclearthermalrockets' into…
Brycey92 Jun 19, 2021
8ec33e8
Remove debug log printouts
Brycey92 Jun 19, 2021
81379fc
Undo casts to WorldProviderPlanet
Brycey92 Jun 19, 2021
d3029cb
Add in redstone control to simple station controllers
voidsong-dragonfly Jun 19, 2021
b0fc26c
Improvements and fixes to rocket launch logic
Brycey92 Jun 19, 2021
35d7532
Add in rocket fire, shading, microwave fixes, comparator support
voidsong-dragonfly Jun 20, 2021
956c8d7
Merge branch 'feature/nuclearthermalrockets' into 1.12-2.1.0-fixes
Brycey92 Jun 21, 2021
674c0ef
Merge pull request #10 from Brycey92/1.12-2.1.0-fixes
voidsong-dragonfly Jun 21, 2021
41ac6a6
Fix one thing from review
voidsong-dragonfly Jun 21, 2021
882c43e
Apply suggestions from code review
voidsong-dragonfly Jun 21, 2021
aff8125
Make microwave receiver render use GL Enum not ints
voidsong-dragonfly Jun 21, 2021
0a1b751
Merge branch 'feature/nuclearthermalrockets' of https://github.com/si…
voidsong-dragonfly Jun 21, 2021
19354d1
Solve potential NPE
Brycey92 Jun 22, 2021
1050f0d
Merge pull request #12 from Brycey92/1.12-2.1.0-fixes
voidsong-dragonfly Jun 22, 2021
48544f0
Allow to compile
voidsong-dragonfly Jun 23, 2021
48f166f
Merge branch 'feature/nuclearthermalrockets' of https://github.com/si…
voidsong-dragonfly Jun 23, 2021
997f81b
One Last Thing
voidsong-dragonfly Jul 30, 2021
2e29a63
Actually fix things without breaking others
voidsong-dragonfly Jul 31, 2021
8fb7da2
Fix observatory inventory
voidsong-dragonfly Jul 31, 2021
079bfb7
Fix model loading error
voidsong-dragonfly Aug 7, 2021
bc4d132
1.12-specific fluid changes
voidsong-dragonfly Aug 9, 2021
138a22a
Why did I move those?
voidsong-dragonfly Aug 9, 2021
dcdd4a7
Big batch of IDE-prompted code cleanup changes
voidsong-dragonfly Aug 20, 2021
ad93e5a
Clean up one last thing in fueling station
voidsong-dragonfly Aug 20, 2021
177b0c8
Lang updates & cleanup
voidsong-dragonfly Aug 21, 2021
e058a5c
Fix satellite stuff
voidsong-dragonfly Aug 21, 2021
d92323b
Merge pull request #2108 from Silfryi/feature/nuclearthermalrockets
voidsong-dragonfly Aug 21, 2021
d3bb623
Merge pull request #2195 from Silfryi/fix/morecodecleanup
voidsong-dragonfly Aug 21, 2021
199dd3f
update Buildnumber or libVulpes
dmodoomsirius Aug 25, 2021
2a53d50
Fix #2031
voidsong-dragonfly Sep 10, 2021
511361d
Fix biome entity spawn chances that should never be 100% (#2214)
Brycey92 Sep 11, 2021
a1c7676
Fix #2031 (#2217)
voidsong-dragonfly Sep 11, 2021
8ddea81
Update readme to reflect changes to future plans
voidsong-dragonfly Sep 11, 2021
1b8a4e5
Fix fluid capability handling inside rockets
voidsong-dragonfly Sep 12, 2021
cc627ad
Merge remote-tracking branch 'ARBase/1.12' into 1.12
voidsong-dragonfly Sep 12, 2021
8f51aef
Fix dumb issue with rocket loaders
voidsong-dragonfly Sep 12, 2021
8163295
Fix some dumbness with redstone states
voidsong-dragonfly Sep 12, 2021
04f5a40
Fix #1845 as much as we will fix
voidsong-dragonfly Sep 12, 2021
d645b45
Fix some bugs with sky rendering and add a color override boolean
voidsong-dragonfly Sep 12, 2021
2ef4fcd
Next batch of moves for sky rendering
voidsong-dragonfly Sep 13, 2021
6510901
Finally fix planet color and rotation times once and for all
voidsong-dragonfly Sep 14, 2021
66a074b
Add earthbright visor
voidsong-dragonfly Sep 14, 2021
07a7daa
Fix fog coloring in low-atmosphere scenarios and add proper stars to …
voidsong-dragonfly Sep 14, 2021
418a04c
Add stuff same as 1.16.5
voidsong-dragonfly Oct 7, 2021
a67e0f9
Fix rocket rendering stuff
voidsong-dragonfly Oct 8, 2021
aa27f77
Fix added unneeded todo
voidsong-dragonfly Oct 9, 2021
887d7f6
Merge pull request #2222 from Silfryi/1.12
voidsong-dragonfly Oct 10, 2021
d1370df
Hopefully fix NPE with space elevator
voidsong-dragonfly Nov 2, 2021
6075a78
Update stale.yml
voidsong-dragonfly Nov 11, 2021
614442e
comment out stale.yml
dmodoomsirius Jan 18, 2022
6f547c0
Fix observatory crash in SMP
CallMeFoxie Apr 12, 2022
11040cc
Merge pull request #2306 from CallMeFoxie/fix-observatory-crash
voidsong-dragonfly Apr 12, 2022
8e676bd
update deps.gradle
dmodoomsirius Apr 17, 2022
8c4b9a4
Merge branch '1.12' of https://github.com/zmaster587/AdvancedRocketry…
dmodoomsirius Apr 17, 2022
b5690b4
manually merge #2284.
dmodoomsirius Apr 20, 2022
37f1355
finish migrating over #2284# Closes #2284
dmodoomsirius Apr 20, 2022
7a4d18a
thanks to slava added curseforge task back
dmodoomsirius Apr 20, 2022
2e76312
thanks to slava added curseforge task back
dmodoomsirius Apr 20, 2022
0c42fa7
add plugin maven publish
dmodoomsirius Apr 20, 2022
8401ee8
sync
dmodoomsirius Apr 20, 2022
2490cdc
add changelog task
dmodoomsirius Apr 20, 2022
f11a636
change changelog task
dmodoomsirius Apr 20, 2022
f9a28bf
fix a name issue
dmodoomsirius Apr 20, 2022
3e797dd
fix maven publishing
dmodoomsirius Apr 20, 2022
85ceab2
add classifier to debof task
dmodoomsirius Apr 22, 2022
f06bd06
try to get FG to obf the jar..
dmodoomsirius Apr 22, 2022
63d4074
add mcVersion to jar version when building with jenkins
dmodoomsirius Apr 22, 2022
07d55a7
sync
dmodoomsirius Apr 22, 2022
52275ba
Merge pull request #9 from Advanced-Rocketry/1.12
Brycey92 Apr 28, 2022
9c22cb4
Re-implement pull request #2306 from CallMeFoxie/fix-observatory-crash
Brycey92 May 19, 2022
8678bed
Merge pull request #2321 from Brycey92/1.12-asteroid-fix
voidsong-dragonfly May 19, 2022
70c9785
up cf releaseType to release
dmodoomsirius May 22, 2022
fe36e11
Create Finnish translation. (#2340)
MouJouNakki Jan 27, 2023
069332f
XML_CONFIG_README.txt minor corrections and enhancement (#2352)
fimzks Mar 27, 2023
917fa17
pass me the Gradle (#2368)
ROMVoid95 Jul 30, 2023
e1d858f
Small Change, remove dimenstion check when loading worlds (#2369)
Burchard36 Aug 15, 2023
829f54a
Fix biome entity spawn chances that should never be 100% (#2315)
Brycey92 Aug 15, 2023
d4e09b3
1.12 tabr fixed (#2317)
Brycey92 Aug 15, 2023
8b2c9f1
Fix biome spawning on cold planets and setting the LEO explicitly in …
MouJouNakki Aug 15, 2023
c5cd5af
Fix Chemical Reactor NPE and other recipe bugs, version number issues…
Brycey92 Aug 15, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
64 changes: 64 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
---
name: Bug report
about: Create a report to help us fix problems and improve your experience
title: "[BUG]"
labels: Unconfirmed Bug
assignees: ''

---

[Please fill out the form below and delete the sections in square brackets after reading them]

## Version of Advanced Rocketry
>[insert here

>Why is this important?
>Knowing the version of Advanced Rocketry helps us narrow down an offending piece of code faster because we can easily determine what code is added and when.]

## Have you verified this is an issue in the latest unstable build
- [x] Y
- [x] N
- [x] N/A

>[Why is this important?
>If you're not testing with the latest build, you may be encountering a bug that's already been fixed.
>Reporting bugs that have already been fixed wastes everyone's time. (please look in open issues too, somebody else could have already reported it!)]

## Version of LibVulpes
>[insert here

>Why is this important?
>Advanced rocketry depends on a library mod (LibVulpes), some errors can really be in that mod. So knowing the verison helps us not only start looking for fixes there without you needing to anwer more questions, it also helps us know if you have a version mismatch.]

## Version of Minecraft
>[insert here

>Why is this important?
>Different versions of minecraft have different codebases for Advanced Rocketry. Knowing the version of minecraft (and thus AR) helps us pinpoint issues quicker!]

## Does this occur without other mods installed
- [x] Y
- [x] N
- [x] N/A
>If Y, what is the MINIMUM set of mods required.

>[Why is this important?
>Sometimes interactions between mods cause issues. While it can be a problem with Advanced Rocketry, sometimes it's not. When there are a lot of mods, it can take bugtesters HOURS to go through the list to determine the root cause. When there are a lot of bug reports, that can add DAYS to the time it takes to fix a large set of issues.]

## Crash report or log or visualVM (if applicable)
http://pastebin.com is a good place to put them
crash reports that are put in the issue itself are
hard to read
>[insert here

> If it's an issue involving lag, please submit a visualVM sampler snapshot. Mods like lag goggles often do not provide the kind of information needed to debug lag.
> For more information on how to create a snapshot, please see "How to Run CPU Sampling" [here](http://greyfocus.com/2016/05/visualvm-sampling/). Then export the snapshot as an .nps. You may have to zip it since github is weird, then please upload it here.

>Why is this important?
>Full crashlogs contain valuable information like where exactly in the code the error occurred, what other mods may be running and what version of forge you have. This helps us replicate and diagnose the issue FAR faster.]

## Description of the problem
>[How can you reliably reproduce the problem

>Why is this important?
>If we cannot reproduce the problem, we probably cannot fix it at all.]
11 changes: 11 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
name: Feature request
about: Suggest an idea for this project
title: "[Request]"
labels: enhancement
assignees: ''

---

**What do you think is missing or what do you think can be done better**
[Describe in detail what you want to see and how it makes the mod better]
16 changes: 16 additions & 0 deletions .github/issue_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
## Version of Advanced Rocketry
[insert here]
## Have you verified this is an issue in the latest unstable build
Y,N, N/A
## Version of LibVulpes
[insert here]
## Version of Minecraft
[insert here]
## Crash report or log (if applicable)
http://pastebin.com is a good place to put them
crash reports that are put in the issue itself are
hard to read
[insert here]

## Description of the problem
[How can you reliably reproduce the problem]
21 changes: 21 additions & 0 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# name: "Close stale issues"
# on:
# schedule:
# - cron: "0 0 * * *"

# jobs:
# stale:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/[email protected]
# with:
# repo-token: ${{ secrets.GITHUB_TOKEN }}
# stale-pr-message: 'Is this pr still needed?'
# stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Is this still an issue? If yes please comment that it still is.'
# stale-issue-label: 'no-issue-activity'
# exempt-issue-labels: 'enhancement,question,Needs-Info'
# stale-pr-label: 'no-pr-activity'
# exempt-pr-labels: 'awaiting-approval,work-in-progress,PrExempt'
# days-before-stale: 60
# days-before-close: 90

5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,15 @@ out

# gradle
build
output
.gradle

# other
eclipse
run
refresh.bat
AdvancedRocketry.txt
changelog.html
lasthash.txt
libs
*.bak
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
stages {
stage('Build') {
steps {
sh './gradlew clean build curseforge236542 --refresh-dependencies'
sh './gradlew build curseforge236542 publish --refresh-dependencies'
archiveArtifacts artifacts: '**build/libs/*.jar', fingerprint: true
}
}
Expand Down
151 changes: 87 additions & 64 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,72 +1,95 @@
# AdvancedRocketry
A mod about space, exploration, and resources
Advanced Rocketry is a mod about space, exploration, and resources

MileStones:
<b>Advanced Rocketry does not support anything other than Forge at this point - be it Fabric or Sponge </b>

<b>Please be aware Sponge compatibility issues may never be fixed.</b>

Roadmap:
Discord link: https://discord.gg/BbBUmbX

Current Features:
- Rockets can be built from almost any block
- Space stations orbiting any planet/moon
- Warpships to take players between said planets
- planet selection guidance
- Basic machinery (to be redone at future date)
- Generates a fixed number of planets in a single solar system
- fuel mechanics
- Gas system (O2)
- Satellites
- Data collection of planets (not currently fully featured)
- Support for IC2 and RF
- planets can be generated from XML
- Gravity generators for space stations
- stations with day/night cycles
- more Satellites
- mining Satellite (ish, is spacestation bound)
- energy collection satellite
- ore scanning satallite
- collection of materials from asteroids
- asteroids
- automated harvesting
- research system
- random asteroid parameters ( size, composition, location (polar coords)
- research can be done to determine properties



- Rockets that can travel between planets & moons
- Rockets can be configured to use or not use fuel (use fuel by default)
- Can be built from almost any block
- Can be upgraded with different propulsion options
- Basic autogenerated planets
- Generated randomly from planet temperature & atmosphere
- Mix of gas giants and rocky planets
- Advanced XML options for custom planet creation
- Features all Advanced Rocketry options
- Allows mapping other mods dimensions to Advanced Rocketry planets
- Black holes that you can use for power
- Space stations
- Can orbit any planet or moon
- Can choose they amount of light the station gets contstantly by rotation
- Warp ships, capable of going outside planet/moon and sun/planet systems
- Planet Selection Guidance
- Research system that allows for undiscovered planets
- Requires data and artifact to be able to find planets
- Active beacons also make planets visible
- Basic machinery
- Many types of hazardous atmospheres
- High-Pressure atmospheres
- Very High Pressure atmospheres
- Hot atmospheres
- Superheated atmospheres
- Vacuum
- Low-Oxygen atmospheres
- Data collection of planets (not currently fully featured)
- Gravity generators for space stations
- Gravity generators for local areas on planets
- Satellite system
- Data collection satellites
- Can collect three types of data
- Data is used for planetary discovery & asteroid mining
- Oribtal solar power satellites
- Used with the microwave reciever multiblock for power
- Ore Scanning Satellite
- Biome changing satellites
- Asteroid mining
- Automated Harvesting
- Research System
- Random asteroid parameters (size, composition, richness)
- Research can be done to determine properties
- Manual Harvesting
- Player can select as a destination
- temporary dim in created, destroyed when last player leaves
- Gas Giant gas/fluid mining
- Railguns to transfer goods between planets and stations
- Support GTEU, EU, FE, Tesla, and RF as power supplies
- Terraforming




Future Features:
- Other engine types for space ships(ion/plasma)
- Terraforming
- Orbital factories
- rovers (maybe? need a use)
- collection of materials from gas giants
- docking (maybe..)
- planetary mapping system (feasible?)
- more Satellites
- Weather control satellite
- mapping satellite (feasible?)
- clean rooms
- research tree (possible use for planetary data, hire villagers as scientists for you lab!)
- supports for more power systems
- remove RF dependance
- planets actually moving in their orbits
- Railguns to transfer goods between planets and stations
- stations can be positioned over certain locations on planets
- colony management system (seed testificates throughout the universe?)
- config for mapping dims added by other mods to planets
- Gravity generators for local areas on planets
- ground based telescopes
- water detectors (increases info on %dry) space only
- chemical detectors (increases chance of finding planets rich in certain ores) space only
- atmospheric detectors (increases info on pressure; when combined with chemical can detect if planet has harvestable/hazardous gasses) ground and space
- temperature detector (increases info on planetary temperature) space only
- star scanner (increases the likelyhood of finding planets orbiting a star; higher level allows for smaller planets) ground and space
- asteroids
- manual harvesting
- research system
- player can select as a destination
- temporary dim in created, destroyed when last player leaves
- Hardmode
- must protect space stations from meteors
- rockets require life support
- space ships require statis chamber and must be provided with food (unless warp) - tranz9999
- heat system for machines and plasma engine
-

- Rovers (maybe? planetary exploration?)
- Planetary Mapping System (feasible?)
- More Satellites
- Weather Control Satellite
- Mapping satellite (feasible?)
- Clean Rooms (maybe)
- Stations can be positioned over certain locations on planets
- Telescopes -
- Water Detectors (increases info on %dry) ~ space only
- Chemical Detectors (increases chance of finding planets rich in certain ores) ~ space only
- Atmospheric Detectors (increases info on pressure; when combined with chemical can detect if planet has harvestable/hazardous gasses) ~ ground and space
- Temperature Detector (increases info on planetary temperature) ~ space only
- Star Scanner (increases the likelihood of finding planets orbiting a star; higher level allows for smaller planets) ~ ground and Space
- Radio interferometry (lets you discover black holes and get any data quickly) ~ ground only
- Possibility of rockets requiring life support for the player, without which they die
- Larger rocket engines
- T3 engines for nuclear and bipropellant
- _Possible_ T4 engine that is a mini fusion reactor, but unlikely. Up to discrection
- Warp core rework
- Requires data to function
- More data can be used to speed the travel time, past the minimum (maybe)
- Model redo + possibly some auxilary models for auxilary computation banks required for longer jumps
- Terraformer rework
- Completely redo model and concept
- Split terraformer up into a large center with multiple required buildings
- Up gas costs signficantly
9 changes: 5 additions & 4 deletions XML_CONFIG_README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ Example usage; specifes a planet to start exactly opposite the sun from Earth

------------------------------------------------------------------------------------------------------------------------------

The "orbitalTheta" tag specifes the angle of the plane on which the planet rotates around the star or it's host planet, 90 will cause the planet or sun to rise and set in the north and south (the planet would orbit such that it would pass over both poles) whereas 0 with be the normal procession (like orbit over the equator)
The "orbitalPhi" tag specifes the angle of the plane on which the planet rotates around the star or it's host planet, 90 will cause the planet or sun to rise and set in the north and south (the planet would orbit such that it would pass over both poles) whereas 0 with be the normal procession (like orbit over the equator)

Max: 360
Default: 0
Expand All @@ -251,11 +251,11 @@ Max: 2^31 - 1 = 2,147,483,647 (java has no unsigned int...)
Default: 24000
Min: 1

Example usage; specifes a planet to start exactly opposite the sun from Earth
Example usage; specifies a planet named Beebop to have a 10 minute day/night cycle
<galaxy>
<star name="Sol" temp="100" x="0" y="0" numPlanets="1">
<planet name="Earth">
<orbitalTheta>180</orbitalTheta>
<rotationalPeriod>12000</rotationalPeriod>
...
</planet>
</star>
Expand All @@ -268,6 +268,7 @@ and modded biome ids. If this tag is not included then the planet will automati
atmosphere density, gravitationalMultiplier, and distance from the sun.

A list of vanilla biomes can be found at http://minecraft.gamepedia.com/Biome
Also can use the command:"/advancedRocketry planet list" to create a dumplist of all biomes from vanilla and installed mods into the instance folder

Example usage; Planet will generate only ocean and ice plains
<galaxy>
Expand Down Expand Up @@ -307,4 +308,4 @@ Example usage; Adding Twilight forests (with default configs) as a planet around
...
</planet>
</star>
</galaxy>
</galaxy>
Loading