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

Upstream merge - OpenComputers 1.8.4 #121

Merged
merged 7 commits into from
Apr 16, 2024

Conversation

asiekierka
Copy link

No description provided.

ff66theone and others added 7 commits April 7, 2024 14:24
* Update fr_FR.lang

Modified some terms that weren't the same in some places
Deleted spelling mistakes

* Update Settings.scala

Add temperature values

* Update application.conf

Added temperature-related config

* Revert "Update application.conf"

This reverts commit 0cd7cfc.

* Revert "Update Settings.scala"

This reverts commit f53a080.

* Update index.md

Removed some spelling mistakes

* Update adapter.md

Removed two more spelling mistakes

* Update assembler.md

Removed more spelling mistakes

* Update cable.md

Added forgotten words<br>
Translated the "cover" term

* Update capacitor.md

Changed "capaciteur" term into "batterie" because "capaciteur" doesn't exist in french

* Update capacitor.md

Forgot one word to correct
@eigenraven eigenraven enabled auto-merge April 16, 2024 18:06
@eigenraven eigenraven merged commit 4f8033c into GTNewHorizons:master Apr 16, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants