Skip to content

Commit

Permalink
Merge draft into official. (#945)
Browse files Browse the repository at this point in the history 
* Improve wording for E2c1++ and E2c1++++. Closes #727.

* Fix typo in 9g.

Thanks to Brandon Harnish for finding!

* Fix typo: aleready → already

Thanks to Wilson Alvis for spotting this!

* Update `wca-states.md`. (#747)

- Update names:
  - Macedonia → North Macedonia
  - Swaziland → Eswatini
- Fix sorting order.

* Update a few Regs to correctly refer to "solve" instead of "attempt".

Thanks to Manu Vereecken for spotting these.

* Solve instead of attempt

* Fix weird sentence

* Improve the wording of 4b3.

Suggested by Gregor Grigorjan.

4b3b to 4b3d are still a tad ambiguous, but I think it's better to keep them concise instead of 100% clear.

* Add credit section on `wca-states.md`.

* List Armenia under Europe instead of Asia. (#773)

Fixes #772.

* Remove ambiguousness from A3b1

* List project boards

* Review

* Remove references to 1c3a

* Clarify C1b

Clarifying the use of surface during one handed solve.
Issue[#718](<#718>)

* Clarify camera display

Addressing issue #721

* Update wca-guidelines.md

* Update wca-regulations.md

Co-Authored-By: Lucas Garron <lgarron@worldcubeassociation.org>

* Update wca-regulations.md

* Update wca-regulations.md

* Update wca-guidelines.md

* 6a+ fix

There is no sense of calling it a ADDITION as it doesn't refer to a regulation.

* Update wca-regulations.md

* Update README.md

* Update wca-regulations.md

* Update wca-guidelines.md

* Update wca-regulations.md

* Update wca-guidelines.md

Co-Authored-By: Lucas Garron <lgarron@worldcubeassociation.org>

* Update wca-regulations.md

Co-Authored-By: Lucas Garron <lgarron@worldcubeassociation.org>

* Update wca-regulations.md

Co-Authored-By: Iván Brigidano Pérez <47502355+Ivan-Brigidano@users.noreply.github.com>

* Typo fixing

* Update README.md

* Update README.md

* Update title and introductory sentence in the `README.md`

The old intro sentence was more of a subtitle/noun fragment. This changes it into a full sentence.

* Update README.md

* Minutes Log inclusion on the README

* Update README.md

* Update README.md

* States.md punctuation fix

#774

* Update Minute log link and show it as code

* Minutes log link fix

* Update README.md

* E2c2++ WCA Delegate fixing

Thanks @hanwu85 for finding this!

* Rename "opaque object" for BLD to "sight blocker" (#864)

* Allow FMC solutions to be published (#852)

* Allow FMC solutions to be published

Addressing issue #125

* Update wca-regulations.md

* Extra attempt reason recording (#849)

* Extra attempt reason recording

* Update wca-guidelines.md

* Update wca-guidelines.md

Co-Authored-By: Iván Brigidano Pérez <47502355+Ivan-Brigidano@users.noreply.github.com>

* E4: Update "WCA" in "WCA Delegate" to match document style.

* Require scramblers signatures (#854)

* Require scramblers signatures

* Update wca-regulations.md

* Update wca-regulations.md

* Update wca-regulations.md

* Update wca-regulations.md

Co-Authored-By: Lucas Garron <lgarron@worldcubeassociation.org>

* Clarify how to handle missing scramble signatures. (#883)

* Clarify how to handle missing scramble signatures.

* Update wca-guidelines.md

Co-Authored-By: Iván Brigidano Pérez <47502355+Ivan-Brigidano@users.noreply.github.com>

* Turn A1c into 2j3 (#868)

* Turn A1c into 2j3

Addressing Issue #867. This way the regulation affects all events and not only speed solving events.

* Update wca-regulations.md

* Update wca-guidelines.md

* Restore A1c

* Update A6c from judge discretion to Delegate (#885)

* Allow clock pins to be distinguishable (#838)

* Allow clock pins to be distinguishable

Addressing issue  #759

* Update wca-guidelines.md

* Update wca-guidelines.md

* Update wca-guidelines.md

Co-Authored-By: Iván Brigidano Pérez <47502355+Ivan-Brigidano@users.noreply.github.com>

* Update A6e to Delegate discretion (#886)

* Update A6e to Delegate discretion

Addressing [this incident](https://www.worldcubeassociation.org/incidents/23)

* Update wca-regulations.md

* Update gramma in 2k3 and 2k4 so that it's easier to read. (#734)

* Allow to re-scramble duplicate cubes at MBLD (#887)

* Allow to re-scramble duplicate cubes at MBLD

* Update wca-guidelines.md

Co-Authored-By: Lucas Garron <lgarron@worldcubeassociation.org>

* O-rings recommendations movement from Guidelines to Regulations (#855)

* Update wca-guidelines.md

* Update wca-regulations.md

* Update wca-regulations.md

* Update wca-regulations.md

* Update wca-regulations.md

Co-Authored-By: Lucas Garron <lgarron@worldcubeassociation.org>

* Clarification for non-electric aids during FMC. (#839)

* Allow clock pins to be distinguishable

Addressing issue  #759

* Clarification for non-electric aids during FMC.

Addressing issue #815

* Update wca-regulations.md

* Update wca-guidelines.md

* 3h2a exception clarification (#832)

* 3h2a exception clarification

See Issue #826

* Update wca-regulations.md

* Update wca-regulations.md

Co-Authored-By: Lucas Garron <lgarron@worldcubeassociation.org>

* Specify that clock stands are allowed. (#890)

* Specify that clock stands are allowed.

* Update wca-regulations.md

* Update wca-regulations.md

* Minor changes to the README (#893)

* Remove a remaining "Rubik's" from the Style Guide (#892)

* README/style guide changes from the latter half of 2019.

* Change "combined rounds" to "cutoff rounds". Closes #543. (#889)

* Correct H1+ wording (#891)

* Correct H1+ wording

Thanks @Goosly for spotting it!

* Update wca-guidelines.md

* Update wca-guidelines.md

Co-Authored-By: Lucas Garron <lgarron@worldcubeassociation.org>

* Remove bracket rotations in favor of <x, y, z>. Addresses #757. (#888)

* Only allow <x, y, z> rotations. Addresses #757.

Based on feedback, removing more than this may be beneficial, but some competitors strongly prefer to keep them. However, reducing to a single rotation sytem is generally supported, and the community prefers <x, y, z> over bracket rotations.

* Update wca-regulations.md

Co-Authored-By: Iván Brigidano Pérez <47502355+Ivan-Brigidano@users.noreply.github.com>

* Update wca-regulations.md

Co-Authored-By: Iván Brigidano Pérez <47502355+Ivan-Brigidano@users.noreply.github.com>

* Update wca-regulations.md

Co-Authored-By: Iván Brigidano Pérez <47502355+Ivan-Brigidano@users.noreply.github.com>

* Update wca-regulations.md

* Update wca-guidelines.md

* Update wca-guidelines.md

Co-Authored-By: Han Wu <3752812+hanwu85@users.noreply.github.com>

* Revert A6c/A6e to judge's discretion. (#897)

* Revert "Update A6c from judge discretion to Delegate (#885)"

This reverts commit da52628.

* Revert "Update A6e to Delegate discretion (#886)"

This reverts commit 4c5d528.

* Improve H1+ wording (#908)

* Improve 2i2a+ wording (#909)

* Remove official status for 3x3x3 with Feet. (#912)

* Move 2j3 changes to 2k6 (#928)

* Update wca-regulations.md

* Update wca-guidelines.md

* Update wca-regulations.md

* Update wca-regulations.md

* Clarify how to handle missing scramble signatures. (#936)

* Clarify how to handle missing scramble signatures.

* Move phrase into paren to make it clear that it refers specifically to the reason.

* Update wca-guidelines.md

* Update wca-guidelines.md

* Update date for the 2020-01-01 release. (#939)

Co-authored-by: Manu Vereecken <manu.vereecken@hotmail.com>
Co-authored-by: Alberto Pérez de Rada Fiol <apdrf.94@gmail.com>
Co-authored-by: Kotaro Terada <kotarot@apache.org>
Co-authored-by: Han Wu <3752812+hanwu85@users.noreply.github.com>
Co-authored-by: Iván Brigidano Pérez <47502355+Ivan-Brigidano@users.noreply.github.com>
  • Loading branch information
@lgarron @Goosly
@AlbertoPdRF @kotarot @hanwu85 @Ivan-Brigidano
6 people committed Dec 31, 2019
1 parent cd0e6f0 commit 718a330
Show file tree
Hide file tree
Showing 5 changed files with 85 additions and 75 deletions.
22 changes: 17 additions & 5 deletions README.md
View file
@@ -1,11 +1,23 @@
# WCA Documents
# WCA Regulations

Regulations and Guidelines for official Rubik's Cube competitions sanctioned by the [World Cube Association](http://www.worldcubeassociation.org/).
This repository contains the WCA Regulations and Guidelines, which apply to all official competitions sanctioned by the [World Cube Association](http://www.worldcubeassociation.org/).
Regulations and Guidelines for official Rubik's Cube and other twisty puzzles competitions sanctioned by the [World Cube Association](http://www.worldcubeassociation.org/).

Official competitions must always use the current version of the Regulations at <https://www.worldcubeassociation.org/regulations/> (which matches the branch named [`official`](https://github.com/thewca/wca-regulations/tree/official) on GitHub).
Official competitions must always use the current version of the Regulations at <https://www.worldcubeassociation.org/regulations/>, which matches the branch named [`official`](https://github.com/thewca/wca-regulations/tree/official) on GitHub.

The current draft for upcoming Regulations is maintained on the branch named [`draft`](https://github.com/thewca/wca-regulations/tree/draft).
The current draft for upcoming Regulations is maintained on the branch named [`draft`](https://github.com/thewca/wca-regulations/tree/draft). The amendment procedure of the WCA Regulations and Guidelines is made following [Motion 14.2019.1](https://www.worldcubeassociation.org/documents/motions/14.2019.1%20-%20Amendments%20of%20Regulations.pdf).

## Translations

See [`thewca/wca-regulations-translations`](https://github.com/thewca/wca-regulations-translations).
See [`thewca/wca-regulations-translations`](https://github.com/thewca/wca-regulations-translations) for further information.

## WRC Priorities

GitHub Project Boards that keep track of our current work:

- [WRC Priorities](https://github.com/orgs/thewca/projects/3).
- [Regulations 2020 – Priorities](https://github.com/orgs/thewca/projects/4).

## WRC Minutes Log

GitHub Wiki page that keeps track of the Committee meeting minutes. See [`thewca/wca-regulations/wiki`](https://github.com/thewca/wca-regulations/wiki).
2 changes: 1 addition & 1 deletion style-guide.md
View file
Expand Up @@ -57,7 +57,7 @@ This document is meant to clarify some of the implicit conventions adopted in WC
- References to the "(WCA) Regulations" and "(WCA) Guidelines" are capitalized. For example, Regulation 1a) is a regulation in the Regulations. This makes it clear that "Regulations" refers to the body of the WCA Regulations.
- Also should be capitalized: Competitors Area.
- The WCA Delegate should be mentioned by their full title.
- Puzzles names are capitalized. Event formats like "One-Handed Solving" are also capitalized. A puzzle name + event format should omit the word "Solving" (e.g. Rubik's Cube: One-Handed). See Regulation 9b for official puzzles and event formats.
- Puzzles names are capitalized. Event formats like "One-Handed Solving" are also capitalized. A puzzle name + event format should omit the word "Solving" (e.g. 3x3x3 One-Handed). See Regulation 9b for official puzzles and event formats.

### Recommended Word Choices

Expand Down

0 comments on commit 718a330

Please sign in to comment.