diff --git a/README.md b/README.md index 9e1adcc80..861db20b5 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ This mod is [licensed under the **MIT license**](https://github.com/MightyPirate If you would like to contribute better textures for certain items or blocks, feel free to pull-request them. If you would like to contribute *alternative* textures, make it a resource pack, and post it on the forums, for example. 3. **Documentation** Help with keeping the [wiki][] up to date would be *really* appreciated. If you notice anything amiss and know better, fix it. If you don't ask someone who does, then fix it. If you had a question answered, consider adding that information somewhere in the wiki where you would have expected to find that information. - There are also the [files containing the ingame help][manpages], which could probably be much better than they are right now. Improvements to them, and new ones (e.g. for the libraries, such as `text` or `sides`) would help a lot. Thanks! + There are also the files containing the ingame help [for programs][manpages] and [for blocks and items][manual], which could probably be much better than they are right now. Improvements to them, and new ones (e.g. for the libraries, such as `text` or `sides`) would help a lot. Thanks! 4. **Robot Names** Robots get a random name when placed (unless set with an Anvil). The list the names are chose from [can be found here][robot names]. Feel free to pull request additional names! *However*: since the list has grown to a considerable length already, here are the two basic criteria for new names: it must either be a real or fictional robot, or an AI that at least *appears* to be self-aware. @@ -99,7 +99,8 @@ In the case you wish to use Eclipse rather than IntelliJ IDEA, the process is mo [jenkins]: http://ci.cil.li/ [localizations]: https://github.com/MightyPirates/OpenComputers/tree/master-MC1.7.10/src/main/resources/assets/opencomputers/lang [loot]: https://github.com/MightyPirates/OpenComputers/tree/master-MC1.7.10/src/main/resources/assets/opencomputers/loot -[manpages]: https://github.com/MightyPirates/OpenComputers/tree/master-MC1.7.10/src/main/resources/assets/opencomputers/lua/rom/usr/man +[manpages]: https://github.com/MightyPirates/OpenComputers/tree/master-MC1.7.10/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man +[manual]: https://github.com/MightyPirates/OpenComputers/tree/master-MC1.7.10/src/main/resources/assets/opencomputers/doc [mcf]: http://www.minecraftforum.net/topic/2201440-opencomputers-v122/ [pack.mcmeta]: https://github.com/MightyPirates/OpenComputers/blob/master-MC1.7.10/src/main/resources/pack.mcmeta [releases]: https://github.com/MightyPirates/OpenComputers/releases diff --git a/build.gradle b/build.gradle index efb672f38..6e5763368 100644 --- a/build.gradle +++ b/build.gradle @@ -93,7 +93,7 @@ repositories { } maven { name = "dmodoomsirius" - url = "http://ci.dmodoomsirius.me/maven/" + url = "http://api.dmodoomsirius.me/" } maven { name = "ue" @@ -187,7 +187,7 @@ dependencies { provided "mcp.mobius.waila:Waila:${config.waila.version}_${config.minecraft.version}:dev" provided "net.industrial-craft:industrialcraft-2:${config.ic2.version}:dev" provided "net.sengir.forestry:forestry_${config.minecraft.version}:${config.forestry.version}:dev" - provided "notenoughkeys:NeK:${config.minecraft.version}-${config.nek.version}:deobf-dev" + provided "dev.modwarriors.notenoughkeys:NotEnoughKeys:${config.minecraft.version}-${config.nek.version}:deobf-dev" provided "qmunity:QmunityLib:${config.qmunitylib.version}:deobf" provided "tmech:TMechworks:${config.minecraft.version}-${config.tmech.version}:deobf" provided ("mrtjp:ProjectRed:${config.projred.version}:dev") { diff --git a/build.properties b/build.properties index 4ea0924c5..da1dd9ba5 100644 --- a/build.properties +++ b/build.properties @@ -32,7 +32,7 @@ mekanism.version=7.1.2 mfr.cf=2229/626 mfr.version=[1.7.10]2.8.0RC8-86 nei.version=1.0.3.57 -nek.version=1.0.0b2dev +nek.version=2.0.0b4 projred.version=1.7.10-4.6.2.82 qmunitylib.version=0.1.105 rc.cf=2219/321 diff --git a/src/main/resources/assets/opencomputers/doc/en_US/block/index.md b/src/main/resources/assets/opencomputers/doc/en_US/block/index.md index 26a47e734..744a458d7 100644 --- a/src/main/resources/assets/opencomputers/doc/en_US/block/index.md +++ b/src/main/resources/assets/opencomputers/doc/en_US/block/index.md @@ -26,6 +26,7 @@ Keep in mind that some of these may not be available, depending on the recipe se * [Geolyzer](geolyzer.md) * [Motion Sensor](motionSensor.md) * [Redstone I/O](redstone.md) +* [Transposer](transposer.md) * [Waypoint](waypoint.md) ## Assembly / Printing diff --git a/src/main/resources/assets/opencomputers/doc/ru_RU/block/index.md b/src/main/resources/assets/opencomputers/doc/ru_RU/block/index.md index ce0ebf1d9..c8087e8f3 100644 --- a/src/main/resources/assets/opencomputers/doc/ru_RU/block/index.md +++ b/src/main/resources/assets/opencomputers/doc/ru_RU/block/index.md @@ -26,6 +26,7 @@ * [Геоанализатор](geolyzer.md) * [Датчик движения](motionSensor.md) * [Редстоун-I/O](redstone.md) +* [Транспозер](transposer.md) * [Путевая точка](waypoint.md) ## Сборка / Печать