Skip to content

spanish translations #108

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

Open
wants to merge 27 commits into
base: 1.20.1
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
216aaf2
migrate from Forge to Neo
RogueLogix Sep 24, 2023
c7a8e96
use publish task for publish action
RogueLogix Sep 24, 2023
75c16a2
add VK dep for Quartz at dev time
RogueLogix Sep 25, 2023
7c08080
fix datagen after Neo migration
RogueLogix Oct 3, 2023
23400b6
add SimulationConfiguration
RogueLogix Oct 3, 2023
053805e
allow SimulationConfiguration construction from a JSON map
RogueLogix Oct 3, 2023
d45b33b
move passivelyCooled to configuration
RogueLogix Oct 3, 2023
5e92311
mark simulation save as NotNull
RogueLogix Oct 3, 2023
aa2fd22
allow registries to be loaded without Neo deps
RogueLogix Oct 3, 2023
5af46ad
add Vulkan backed simulation
RogueLogix Oct 19, 2023
1dad1e3
fix SimulationConfiguration json deserialization
RogueLogix Oct 19, 2023
ce6eade
update changelog and bump version
RogueLogix Oct 19, 2023
15dbadd
add z size for height zero
RogueLogix Oct 20, 2023
3abc380
dont use mojang's pair
RogueLogix Oct 22, 2023
5d0a739
update quartz
RogueLogix Oct 22, 2023
8302634
add glslc to git ignore
RogueLogix Oct 22, 2023
046b0d4
add setAllControlRodInsertions to simulation
RogueLogix Oct 28, 2023
563fb53
fix synchronization issues with VkMemUtil
RogueLogix Oct 28, 2023
5e2e1c3
update serialized description format to reduce file size
RogueLogix Oct 28, 2023
9fdaf03
add constant transition properties record
RogueLogix Oct 28, 2023
3dc2336
Fix mod compat recipes (including AllTheMods/ATM-8#1766)
gizmocodes Nov 19, 2023
02ff3a3
Remove defunct superheated sodium fluid
gizmocodes Nov 19, 2023
9fe97f8
async reactor simulation
RogueLogix Dec 18, 2023
b08980a
1.20.4
RogueLogix Feb 18, 2024
5d3a43d
Create es_es.json
SrNadien Mar 29, 2025
5d9c6e7
Create es_ar.json
SrNadien Mar 29, 2025
23bbf90
Create es_mx.json
SrNadien Mar 29, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ jobs:
- uses: actions/checkout@v2
- run: git submodule update --init --recursive
- id: mainbuild
run: ./gradlew build
- run: ./gradlew publishToMavenLocal
run: ./gradlew :publish
- run: mkdir jars
- run: mv build/libs/biggerreactors-* jars/
- uses: actions/upload-artifact@v2
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ out
*.ipr
*.iws
*.iml
.idea

# gradle
build
Expand All @@ -31,3 +30,7 @@ logs

# Files from Forge MDK
forge*changelog.txt

publishlocal

glslc
11 changes: 11 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions .idea/inspectionProfiles/PhosCodeStyle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

64 changes: 64 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

72 changes: 72 additions & 0 deletions .idea/remote-targets.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Phosphophyllite
Submodule Phosphophyllite updated 80 files
+1 −2 .github/workflows/publish.yaml
+0 −1 .gitignore
+11 −0 .idea/.gitignore
+20 −0 .idea/codeStyles/Project.xml
+5 −0 .idea/codeStyles/codeStyleConfig.xml
+6 −0 .idea/compiler.xml
+18 −0 .idea/gradle.xml
+28 −0 .idea/inspectionProfiles/PhosCodeStyle.xml
+6 −0 .idea/inspectionProfiles/profiles_settings.xml
+16 −0 .idea/misc.xml
+8 −0 .idea/modules.xml
+6 −0 .idea/vcs.xml
+76 −160 build.gradle
+6 −0 changelog.md
+7 −5 gradle.properties
+ gradle/wrapper/gradle-wrapper.jar
+3 −2 gradle/wrapper/gradle-wrapper.properties
+16 −0 settings.gradle
+10 −10 src/main/java/net/roguelogix/phosphophyllite/Phosphophyllite.java
+0 −1 src/main/java/net/roguelogix/phosphophyllite/blocks/PhosphophylliteOre.java
+0 −63 src/main/java/net/roguelogix/phosphophyllite/blocks/PhosphophylliteOreTile.java
+8 −16 src/main/java/net/roguelogix/phosphophyllite/blocks/blackholes/FluidBlackHoleTile.java
+7 −15 src/main/java/net/roguelogix/phosphophyllite/blocks/blackholes/ItemBlackHoleTile.java
+8 −8 src/main/java/net/roguelogix/phosphophyllite/blocks/blackholes/PowerBlackHole.java
+53 −57 src/main/java/net/roguelogix/phosphophyllite/blocks/blackholes/PowerBlackHoleTile.java
+12 −19 src/main/java/net/roguelogix/phosphophyllite/blocks/whiteholes/FluidWhiteHoleTile.java
+12 −26 src/main/java/net/roguelogix/phosphophyllite/blocks/whiteholes/ItemWhiteHoleTile.java
+7 −8 src/main/java/net/roguelogix/phosphophyllite/blocks/whiteholes/PowerWhiteHole.java
+28 −48 src/main/java/net/roguelogix/phosphophyllite/blocks/whiteholes/PowerWhiteHoleTile.java
+100 −0 src/main/java/net/roguelogix/phosphophyllite/capability/CachedWrappedBlockCapability.java
+37 −95 src/main/java/net/roguelogix/phosphophyllite/client/gui/GuiSync.java
+3 −3 src/main/java/net/roguelogix/phosphophyllite/client/gui/RenderHelper.java
+2 −2 src/main/java/net/roguelogix/phosphophyllite/client/gui/ScreenCallbacks.java
+2 −2 src/main/java/net/roguelogix/phosphophyllite/client/gui/api/IRender.java
+2 −2 src/main/java/net/roguelogix/phosphophyllite/client/gui/api/ITooltip.java
+2 −2 src/main/java/net/roguelogix/phosphophyllite/client/gui/elements/AbstractElement.java
+4 −4 src/main/java/net/roguelogix/phosphophyllite/client/gui/elements/InteractiveElement.java
+2 −2 src/main/java/net/roguelogix/phosphophyllite/client/gui/elements/RenderedElement.java
+2 −2 src/main/java/net/roguelogix/phosphophyllite/client/gui/elements/TooltipElement.java
+6 −6 src/main/java/net/roguelogix/phosphophyllite/client/gui/screens/PhosphophylliteScreen.java
+47 −61 src/main/java/net/roguelogix/phosphophyllite/config/ConfigManager.java
+4 −4 src/main/java/net/roguelogix/phosphophyllite/config/ConfigRegistration.java
+2 −1 src/main/java/net/roguelogix/phosphophyllite/config/ConfigType.java
+17 −2 src/main/java/net/roguelogix/phosphophyllite/config/spec/SpecObjectNode.java
+270 −280 src/main/java/net/roguelogix/phosphophyllite/energy/EnergyHandlerWrappers.java
+21 −70 src/main/java/net/roguelogix/phosphophyllite/energy/IEnergyTile.java
+7 −6 src/main/java/net/roguelogix/phosphophyllite/energy/IPhosphophylliteEnergyHandler.java
+2 −1 src/main/java/net/roguelogix/phosphophyllite/event/ReloadDataEvent.java
+3 −3 src/main/java/net/roguelogix/phosphophyllite/fluids/FluidHandlerWrapper.java
+5 −6 src/main/java/net/roguelogix/phosphophyllite/fluids/IPhosphophylliteFluidHandler.java
+25 −21 src/main/java/net/roguelogix/phosphophyllite/fluids/MekanismGasWrappers.java
+17 −31 src/main/java/net/roguelogix/phosphophyllite/fluids/PhosphophylliteFluidStack.java
+25 −0 src/main/java/net/roguelogix/phosphophyllite/items/Wrench.java
+0 −8 src/main/java/net/roguelogix/phosphophyllite/mixin/helpers/IPhosphophylliteLazyOptional.java
+0 −21 src/main/java/net/roguelogix/phosphophyllite/mixin/mixins/LazyOptionalMixin.java
+1 −19 src/main/java/net/roguelogix/phosphophyllite/modular/api/TileModule.java
+4 −4 src/main/java/net/roguelogix/phosphophyllite/modular/tile/IIsTickingTracker.java
+0 −271 src/main/java/net/roguelogix/phosphophyllite/modular/tile/ISidedMultipart.java
+8 −50 src/main/java/net/roguelogix/phosphophyllite/modular/tile/PhosphophylliteTile.java
+7 −7 src/main/java/net/roguelogix/phosphophyllite/multiblock/MultiblockRegistry.java
+69 −28 src/main/java/net/roguelogix/phosphophyllite/networking/SimplePhosChannel.java
+70 −0 src/main/java/net/roguelogix/phosphophyllite/registry/CapabilityRegistration.java
+2 −2 src/main/java/net/roguelogix/phosphophyllite/registry/PhosphophylliteFluid.java
+7 −0 src/main/java/net/roguelogix/phosphophyllite/registry/RegisterCapability.java
+161 −62 src/main/java/net/roguelogix/phosphophyllite/registry/Registry.java
+0 −14 src/main/java/net/roguelogix/phosphophyllite/registry/SideOnly.java
+1 −1 src/main/java/net/roguelogix/phosphophyllite/repack/tnjson/JsonSerializer.java
+12 −0 src/main/java/net/roguelogix/phosphophyllite/serialization/PhosphophylliteCompound.java
+2 −2 src/main/java/net/roguelogix/phosphophyllite/threading/Queues.java
+1 −1 src/main/java/net/roguelogix/phosphophyllite/threading/WorkQueue.java
+15 −0 src/main/java/net/roguelogix/phosphophyllite/util/API.java
+4 −3 src/main/java/net/roguelogix/phosphophyllite/util/NonnullDefault.java
+5 −0 src/main/java/net/roguelogix/phosphophyllite/util/Pair.java
+3 −3 src/main/java/net/roguelogix/phosphophyllite/util/Util.java
+2 −2 src/main/resources/META-INF/accesstransformer.cfg
+11 −8 src/main/resources/META-INF/mods.toml
+6 −0 src/main/resources/assets/phosphophyllite/models/item/wrench.json
+6 −0 src/main/resources/data/forge/tags/items/tools/wrench.json
+2 −3 src/main/resources/phosphophyllite.mixins.json
+ src/main/resources/phosphophyllite.png
2 changes: 1 addition & 1 deletion Quartz
Submodule Quartz updated 47 files
+1 −2 .github/workflows/publish.yaml
+2 −1 .gitignore
+11 −0 .idea/.gitignore
+20 −0 .idea/codeStyles/Project.xml
+5 −0 .idea/codeStyles/codeStyleConfig.xml
+6 −0 .idea/compiler.xml
+19 −0 .idea/gradle.xml
+17 −0 .idea/inspectionProfiles/QuartzCodeStyle.xml
+6 −0 .idea/inspectionProfiles/profiles_settings.xml
+15 −0 .idea/misc.xml
+6 −0 .idea/vcs.xml
+1 −1 Phosphophyllite
+122 −156 build.gradle
+4 −0 changelog.md
+8 −7 gradle.properties
+ gradle/wrapper/gradle-wrapper.jar
+3 −2 gradle/wrapper/gradle-wrapper.properties
+17 −0 settings.gradle
+6 −9 src/main/java/net/roguelogix/quartz/Quartz.java
+8 −3 src/main/java/net/roguelogix/quartz/QuartzConfig.java
+1 −1 src/main/java/net/roguelogix/quartz/QuartzEvent.java
+24 −8 src/main/java/net/roguelogix/quartz/internal/Buffer.java
+7 −6 src/main/java/net/roguelogix/quartz/internal/EventListener.java
+2 −0 src/main/java/net/roguelogix/quartz/internal/IrisDetection.java
+11 −3 src/main/java/net/roguelogix/quartz/internal/MultiBuffer.java
+46 −33 src/main/java/net/roguelogix/quartz/internal/QuartzCore.java
+33 −0 src/main/java/net/roguelogix/quartz/internal/QuartzDebug.java
+18 −4 src/main/java/net/roguelogix/quartz/internal/common/InternalMesh.java
+7 −3 src/main/java/net/roguelogix/quartz/internal/gl33/GL33Core.java
+12 −1 src/main/java/net/roguelogix/quartz/internal/gl33/GL33LightEngine.java
+1 −1 src/main/java/net/roguelogix/quartz/internal/gl33/batching/GL33DrawBatch.java
+36 −17 src/main/java/net/roguelogix/quartz/internal/gl46/GL46Buffer.java
+8 −2 src/main/java/net/roguelogix/quartz/internal/gl46/GL46Core.java
+18 −9 src/main/java/net/roguelogix/quartz/internal/gl46/GL46FeedbackDrawing.java
+19 −9 src/main/java/net/roguelogix/quartz/internal/gl46/GL46LightEngine.java
+20 −7 src/main/java/net/roguelogix/quartz/internal/gl46/batching/GL46DrawBatch.java
+14 −0 src/main/java/net/roguelogix/quartz/internal/gl46/batching/GL46InstanceManager.java
+15 −10 src/main/java/net/roguelogix/quartz/internal/mixin/LevelRendererMixin.java
+14 −4 src/main/java/net/roguelogix/quartz/internal/util/PointerWrapper.java
+4 −1 src/main/java/net/roguelogix/quartz/internal/util/ShitMojangShouldHaveButDoesnt.java
+8 −1 src/main/java/net/roguelogix/quartz/internal/vk/VKCore.java
+44 −44 src/main/resources/META-INF/accesstransformer.cfg
+12 −10 src/main/resources/META-INF/mods.toml
+4 −4 src/main/resources/assets/quartz/shaders/gl33/dynamic_matrix.vert
+16 −34 src/main/resources/assets/quartz/shaders/gl33/light_post_pass.vert
+6 −6 src/main/resources/assets/quartz/shaders/gl33/transform_feedback.vert
+1 −0 src/main/resources/assets/quartz/shaders/gl46/transform_feedback.vert
Loading