Skip to content

Commit 7198a31

Browse files
committed
Merge branch 'api-8' into api-9
2 parents 31c8959 + 326bc02 commit 7198a31

File tree

3 files changed

+5
-14
lines changed

3 files changed

+5
-14
lines changed

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
We will always have a need for developers to help us improve Sponge. There is no such thing as a perfect project and things can always be improved. If you are a developer and are interested in helping then please do not hesitate. Just make sure you follow our guidelines.
44

5-
Please check our [Contribution Guidelines in the Sponge Documentation](https://docs.spongepowered.org/en/contributing/guidelines.html) for more information.
5+
Please check our [Contribution Guidelines in the Sponge Documentation](https://docs.spongepowered.org/stable/en/contributing/guidelines.html) for more information.

README.md

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ A mature Minecraft plugin API (not including an implementation), licensed under
66
* [Source]
77
* [Issues]
88
* [Documentation]
9-
* [Community Discord]
10-
* [Community IRC]: [#sponge on irc.esper.net]
11-
* [Development IRC]: [#spongedev on irc.esper.net]
129
* [Preparing for Development]
1310
* [Javadocs]
11+
* [Discord] `#plugins`
1412

1513
## Prerequisites
1614
* [Java] 8 (JDK 16 recommended for development)
@@ -42,13 +40,6 @@ Are you a talented programmer looking to contribute some code? We'd love the hel
4240
[Java]: http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html
4341
[Source]: https://github.com/SpongePowered/SpongeAPI/
4442
[MIT License]: https://www.tldrlegal.com/license/mit-license
45-
[Community Discord]: https://discord.gg/PtaGRAs
46-
[Community IRC]: https://kiwiirc.com/client/irc.esper.net:+6697/?nick=sponge|?#sponge
47-
[Development IRC]: https://kiwiirc.com/client/irc.esper.net:+6697/?nick=sponge|?#spongedev
48-
[Preparing for Development]: https://docs.spongepowered.org/en/preparing/
49-
[#sponge on irc.esper.net]: irc://irc.esper.net/#sponge
50-
[Development Chat]: https://webchat.esper.net/?channels=spongedev
51-
[#spongedev on irc.esper.net]: irc://irc.esper.net/#spongedev
52-
[Preparing for Development]: https://docs.spongepowered.org/en/preparing/
43+
[Discord]: https://discord.gg/PtaGRAs
44+
[Preparing for Development]: https://docs.spongepowered.org/stable/en/preparing/
5345
[Javadocs]: https://jd.spongepowered.org
54-
[stable-7]: https://github.com/SpongePowered/SpongeAPI/tree/stable-7

src/main/java/org/spongepowered/api/registry/Registry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
* @param <T> The type
3838
*/
3939
@DoNotStore
40-
public interface Registry<T> extends Iterable<RegistryEntry<T>> {
40+
public interface Registry<T> {
4141

4242
/**
4343
* Gets the {@link ResourceKey key} identifying this registry.

0 commit comments

Comments
 (0)