AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-13 09:18:05 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,089 Commits 29 Branches 143 Tags
Commit Graph

4089 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rashdan
3257a285f6 Modified case1.md 2015-04-08 13:36:16 -07:00
Florian Nücke
6c305118e8 Fixed creative drone, whoops. 2015-04-08 22:27:19 +02:00
Rashdan
9a047348ed Added some more links, modified case1.md for specific Case info 2015-04-08 13:23:17 -07:00
Florian Nücke
296cc461bb Fix potential crashes from bad block/item definitions for images. Fix wrapped whitespace not being trimmed. 2015-04-08 22:17:51 +02:00
Rashdan
2f4a3cd9a7 Added some internal links 2015-04-08 12:59:02 -07:00
Rashdan
f68aea962e Added Computer.md summary 2015-04-08 12:35:51 -07:00
Florian Nücke
89818f676a Fixed GUI desync issue, guess have to tell the server we closed the manual after all. 2015-04-08 21:07:51 +02:00
Florian Nücke
90f403115a Fix manual not opening from NEI usage screen when not holding manual in hand. Closes #1033. 2015-04-08 20:36:02 +02:00
Florian Nücke
91d93b1975 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-04-08 19:23:27 +02:00
Florian "Sangar" Nücke
0cc67b9139 Merge pull request #1032 from Vexatos/patch-20 
Recoloured some of the loot disks.
 2015-04-08 19:22:58 +02:00
Florian Nücke
79c855d9a2 Ignore page changes if we're already on that page. 2015-04-08 19:22:00 +02:00
Florian Nücke
fe1cd7917b Removed NEI usage handler for documentation, added button opening manual instead. 2015-04-08 19:20:53 +02:00
Vexatos
5a60dc86ab Re-did some of the weight values. 
Also improved the OpenIRC disk colour.
 2015-04-08 18:07:36 +02:00
Vexatos
92df9d37a9 Recoloured some of the loot disks. 2015-04-08 17:41:39 +02:00
Florian Nücke
bb3ecce24c Pulled all the usage strings into doc files. 2015-04-08 17:35:29 +02:00
Florian Nücke
2ca87ffa0a Made manual localizable. I doubt anyone ever will, but hey. 2015-04-08 15:06:08 +02:00
Florian Nücke
bf9a41e1d2 Added support for http links. 2015-04-08 14:42:41 +02:00
Florian Nücke
6b4e5f0e0d Scaling down images that are too wide, moved example stuff to example page. 2015-04-08 14:31:10 +02:00
Florian Nücke
e496bf3cd4 Made scrollbar in manual mouse-interactive. 2015-04-08 14:14:48 +02:00
Florian Nücke
a8a570defe Closing manual when popping the last history entry. 2015-04-08 13:59:41 +02:00
Florian Nücke
e44b65b986 Open page of clicked blocks. Redirects, e.g. for blocks with tiers. 2015-04-08 13:56:48 +02:00
Florian Nücke
38a6b626e9 Manual localizations. 2015-04-08 13:24:57 +02:00
Florian Nücke
0281d035d8 Fixed manual GUI init order. 2015-04-08 13:15:16 +02:00
Florian Nücke
6f621f53d8 Recipe for manual, using manual in recipe for Lua BIOS and OpenOS now. 2015-04-08 13:13:50 +02:00
Florian Nücke
9a23e10a91 Forget about hovered links when not hovering them anymore. 2015-04-08 13:11:12 +02:00
Florian Nücke
d49bb94e56 Links work, basic navigation is in place. 2015-04-08 13:01:07 +02:00
Florian Nücke
61f2eb268d Allow specifying items, blocks or oredict names for images. 
Kinda meh because it obviously won't work when viewed via another Markdown parser, but it's not too terrible, either. Better than introducing <!--[OC:...]--> or something like that...
 2015-04-08 12:17:06 +02:00
Florian Nücke
c65142a059 Basic imager suppert, loading documents from resource. 2015-04-08 09:37:50 +02:00
Florian Nücke
c1156aab38 Fixed gap in hit detection. 2015-04-08 04:35:26 +02:00
Florian Nücke
282875cab4 Added testing tooltips for links and fixed spacing after headers. 2015-04-08 04:16:51 +02:00
Florian Nücke
dc5bc93766 Interactive segment hover detection, link hightlight rendering and some nested rendering fixes. 2015-04-08 03:42:04 +02:00
Florian Nücke
bef070b9ff Basic scrolling logic. 2015-04-08 02:16:54 +02:00
Florian Nücke
ca8f1e3b94 Initial work on ingame documentation via a manual / book. 
Very, *very* basic Markdown parser and renderer working.
 2015-04-08 01:02:42 +02:00
Florian Nücke
2d778f20fa Backported a few more code improvements from the 1.8 branch, to make keeping the branches in sync easier. 
Merge conflicts, here I come...
 2015-04-07 15:25:34 +02:00
Florian Nücke
654749c17a Did I mention constants, yet? >_> 2015-04-07 15:12:19 +02:00
Florian Nücke
715c68a127 Builderized achievements. 2015-04-07 14:40:42 +02:00
Florian Nücke
838083b755 All the constants. All of them. 2015-04-07 13:46:26 +02:00
Florian Nücke
eaf97ae33a Renamed some internal constants for consistency. 
Fixed change to OpenOS disk creation in last commit / merge.

(cherry picked from commit b6837d158329632bf7ed281a490e0c8a33cfcd2b)

Conflicts:
	src/main/scala/li/cil/oc/Constants.scala
	src/main/scala/li/cil/oc/common/Achievement.scala
	src/main/scala/li/cil/oc/common/Loot.scala
	src/main/scala/li/cil/oc/common/init/Items.scala
 2015-04-07 13:34:52 +02:00
Florian Nücke
f672f88b24 Pulling a bunch of constants (item and block names for now) into a single class. 
Minor rendering adjustments after updating Forge version.

(cherry picked from commit 707a5c728c9a7eba2648c2f3b89f6138e99c878a)

Conflicts:
	build.properties
	src/main/scala/li/cil/oc/CreativeTab.scala
	src/main/scala/li/cil/oc/client/Proxy.scala
	src/main/scala/li/cil/oc/client/renderer/HighlightRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/block/ExtendedBlockModel.scala
	src/main/scala/li/cil/oc/client/renderer/item/ItemRenderer.scala
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/common/Loot.scala
	src/main/scala/li/cil/oc/common/PacketHandler.scala
	src/main/scala/li/cil/oc/common/Proxy.scala
	src/main/scala/li/cil/oc/common/block/Item.scala
	src/main/scala/li/cil/oc/common/block/RobotAfterimage.scala
	src/main/scala/li/cil/oc/common/block/RobotProxy.scala
	src/main/scala/li/cil/oc/common/block/Screen.scala
	src/main/scala/li/cil/oc/common/component/Terminal.scala
	src/main/scala/li/cil/oc/common/component/TextBuffer.scala
	src/main/scala/li/cil/oc/common/entity/Drone.scala
	src/main/scala/li/cil/oc/common/init/Blocks.scala
	src/main/scala/li/cil/oc/common/init/Items.scala
	src/main/scala/li/cil/oc/common/item/Analyzer.scala
	src/main/scala/li/cil/oc/common/item/Tablet.scala
	src/main/scala/li/cil/oc/common/recipe/ExtendedRecipe.scala
	src/main/scala/li/cil/oc/common/recipe/Recipes.scala
	src/main/scala/li/cil/oc/common/template/DroneTemplate.scala
	src/main/scala/li/cil/oc/common/template/MicrocontrollerTemplate.scala
	src/main/scala/li/cil/oc/common/template/NavigationUpgradeTemplate.scala
	src/main/scala/li/cil/oc/common/template/RobotTemplate.scala
	src/main/scala/li/cil/oc/common/template/ServerTemplate.scala
	src/main/scala/li/cil/oc/common/template/TabletTemplate.scala
	src/main/scala/li/cil/oc/common/tileentity/Keyboard.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/TextBuffer.scala
	src/main/scala/li/cil/oc/integration/opencomputers/DriverBlockEnvironments.scala
	src/main/scala/li/cil/oc/integration/opencomputers/DriverFileSystem.scala
	src/main/scala/li/cil/oc/integration/opencomputers/DriverLootDisk.scala
	src/main/scala/li/cil/oc/integration/opencomputers/ModOpenComputers.scala
	src/main/scala/li/cil/oc/util/ItemCosts.scala
 2015-04-07 13:32:23 +02:00
Florian Nücke
7628210299 Pulling a bunch of constants (item and block names for now) into a single class. 
Minor rendering adjustments after updating Forge version.

(cherry picked from commit 707a5c728c9a7eba2648c2f3b89f6138e99c878a)

Conflicts:
	build.properties
	src/main/scala/li/cil/oc/CreativeTab.scala
	src/main/scala/li/cil/oc/client/Proxy.scala
	src/main/scala/li/cil/oc/client/renderer/HighlightRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/block/ExtendedBlockModel.scala
	src/main/scala/li/cil/oc/client/renderer/item/ItemRenderer.scala
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/common/Loot.scala
	src/main/scala/li/cil/oc/common/PacketHandler.scala
	src/main/scala/li/cil/oc/common/Proxy.scala
	src/main/scala/li/cil/oc/common/block/Item.scala
	src/main/scala/li/cil/oc/common/block/RobotAfterimage.scala
	src/main/scala/li/cil/oc/common/block/RobotProxy.scala
	src/main/scala/li/cil/oc/common/block/Screen.scala
	src/main/scala/li/cil/oc/common/component/Terminal.scala
	src/main/scala/li/cil/oc/common/component/TextBuffer.scala
	src/main/scala/li/cil/oc/common/entity/Drone.scala
	src/main/scala/li/cil/oc/common/init/Blocks.scala
	src/main/scala/li/cil/oc/common/init/Items.scala
	src/main/scala/li/cil/oc/common/item/Analyzer.scala
	src/main/scala/li/cil/oc/common/item/Tablet.scala
	src/main/scala/li/cil/oc/common/recipe/ExtendedRecipe.scala
	src/main/scala/li/cil/oc/common/recipe/Recipes.scala
	src/main/scala/li/cil/oc/common/template/DroneTemplate.scala
	src/main/scala/li/cil/oc/common/template/MicrocontrollerTemplate.scala
	src/main/scala/li/cil/oc/common/template/NavigationUpgradeTemplate.scala
	src/main/scala/li/cil/oc/common/template/RobotTemplate.scala
	src/main/scala/li/cil/oc/common/template/ServerTemplate.scala
	src/main/scala/li/cil/oc/common/template/TabletTemplate.scala
	src/main/scala/li/cil/oc/common/tileentity/Keyboard.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/TextBuffer.scala
	src/main/scala/li/cil/oc/integration/opencomputers/DriverBlockEnvironments.scala
	src/main/scala/li/cil/oc/integration/opencomputers/DriverFileSystem.scala
	src/main/scala/li/cil/oc/integration/opencomputers/DriverLootDisk.scala
	src/main/scala/li/cil/oc/integration/opencomputers/ModOpenComputers.scala
	src/main/scala/li/cil/oc/util/ItemCosts.scala
 2015-04-07 13:21:08 +02:00
Florian Nücke
4d33a4860f The mysteries of the MC lighting model. 2015-04-07 10:55:46 +02:00
Florian Nücke
8e66c251be Allow using dyes directly, much less efficiently than cartridges. 2015-04-07 10:47:05 +02:00
Florian Nücke
187d4eff0f Split printer settings into own category. If you changed printer related settings, you may have to set them again. 
Increase cost for 3D prints a bit if they emit custom redstone signal strengths (i.e. something in [1, 14]).
Added settings for chamelium and ink value.
Moved some things around.
 2015-04-07 10:42:21 +02:00
Florian Nücke
565b691e29 Updated comment in config wrt. print light level. 2015-04-06 21:18:53 +02:00
Florian Nücke
a22e694102 Allow wiping HDDs by self-crafting, too (like floppies, i.e. insert into crafting grid on their own). Closes #1026. 
Allow further boosting prints' light level by crafting them with glowstone.
Don't allow crafting prints with beacon base block if they're already a beacon base, don't allow crafting them with glowstone if they're already at maximum brightness.
 2015-04-06 21:17:57 +02:00
Florian Nücke
5ac8d1e930 Show light level of prints in tooltip. 2015-04-06 21:07:19 +02:00
Florian Nücke
828853904d Better: show alternative state in item render when extended tooltip key is pressed. 2015-04-06 19:26:26 +02:00
Florian Nücke
6dd9069c39 Showing redstone output of prints in tooltip. 2015-04-06 19:25:19 +02:00
Florian Nücke
d9d6fa351d Item rendering of prints with two states will now alternate the state rendered. 2015-04-06 19:16:00 +02:00
Florian Nücke
77944aa0c0 Manual light update required on print place; needed in 1.8 so adding it in 1.7 just to be on the safe side. 2015-04-06 17:04:12 +02:00