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

4671 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
26acaccf68 Lighting tweaks. 2015-04-07 11:06:46 +02:00
Florian Nücke
5805f272e5 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/item/data/PrintData.scala
 2015-04-07 10:57:50 +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
6c611681bc Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/renderer/item/ItemRenderer.scala
	src/main/scala/li/cil/oc/common/block/Print.scala
	src/main/scala/li/cil/oc/common/item/data/PrintData.scala
	src/main/scala/li/cil/oc/common/recipe/ExtendedRecipe.scala
	src/main/scala/li/cil/oc/common/recipe/Recipes.scala
 2015-04-06 21:22:17 +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
d5f6c04c0c Handling null values in rotation translation. 2015-04-06 17:13:00 +02:00
Florian Nücke
accf6b429a Adjusted for 1.8. 2015-04-06 17:12:41 +02:00
Florian Nücke
ac43c636a9 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-04-06 17:04:47 +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
Florian Nücke
aafa2ce31d Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/block/Print.scala
	src/main/scala/li/cil/oc/common/item/data/PrintData.scala
	src/main/scala/li/cil/oc/common/tileentity/Print.scala
 2015-04-06 15:16:31 +02:00
Florian Nücke
57efc24995 Version bump. 2015-04-06 14:34:21 +02:00
Florian Nücke
ed516fc9d6 Added debug.isModLoaded. 
Added debug level log messages for registered drivers.
 2015-04-06 14:33:55 +02:00
Florian Nücke
69cc18bcf8 In the meantime... this was easier than I thought, after remembering I could just getmetatable my way up... 2015-04-06 13:54:54 +02:00
Florian Nücke
ffd0908567 Allow specifying level of redstone signal emitted by prints. 
Allow prints to emit light, if so configured. Max light level capped to 8 by default.
 2015-04-06 13:11:52 +02:00
Florian Nücke
e43bd83e0b Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-04-05 21:44:16 +02:00
Florian "Sangar" Nücke
bb14c64ce3 Merge pull request #1022 from Vexatos/patch-19 
Update de_DE.lang
 2015-04-05 21:43:35 +02:00
Vexatos
6f477a3581 <Censored> 
Made the thing safe again.
 2015-04-05 21:38:54 +02:00
Vexatos
b5f30a5580 Update de_DE.lang 2015-04-05 21:35:13 +02:00
Florian Nücke
542f1cb24f Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-04-05 21:02:16 +02:00
Florian Nücke
48e32182e6 I totally saved... 2015-04-05 21:01:59 +02:00
Florian Nücke
530b3ef09a Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-04-05 21:01:17 +02:00
Florian Nücke
d22579f47f Update German localization. Fixed sort order of some translation strings. 2015-04-05 21:00:26 +02:00
Florian Nücke
e4bd13f98a Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/server/network/WirelessNetwork.scala
 2015-04-05 19:25:56 +02:00
Florian Nücke
5b4ba8ae4a Fixed sending wireless messages potentially triggering chunk loads. 2015-04-05 19:22:14 +02:00
Florian Nücke
aa61dd02d5 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-04-05 19:18:25 +02:00
Florian Nücke
ed24b53783 Cleaning up old native libs when not using the tmp dir. 2015-04-05 19:06:55 +02:00
Florian Nücke
ac756adea9 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-04-05 17:58:22 +02:00
Florian Nücke
0ff4cd07a3 Bump version number. 2015-04-05 17:58:05 +02:00
Florian Nücke
38b6f4b939 Added back old generic export bus methods to avoid breaking things, marked them deprecated. 
Gave the AE2 integration a bit of a refactor, pulling out common functionality for parts.
Fixed a few of the callback docs.
General cleanup.
 2015-04-05 17:53:36 +02:00
Florian Nücke
02a13f42a5 Corrected Javadoc on a few methods. 2015-04-05 17:46:11 +02:00
Florian Nücke
a41f3a89ba Bump Forge version, fixed link in Javadoc. 2015-04-05 15:44:18 +02:00
DrummerMC
4ba7afde8b Fixed not building 
Sorry
 2015-04-05 15:33:19 +02:00
DrummerMC
d5b4db009f Fixed merge problems 2015-04-05 14:51:23 +02:00
DrummerMC
038319bc27 Merge pull request #1 from MightyPirates/master-MC1.7.10 
pull OpenComputers
 2015-04-05 14:46:53 +02:00
Florian Nücke
8af6dc13d6 Fixed floppy dying. 2015-04-05 14:43:55 +02:00
Florian Nücke
d99b9a3cc4 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/block/Print.scala
	src/main/scala/li/cil/oc/common/init/Items.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/integration/appeng/DriverExportBus.scala
 2015-04-05 14:42:36 +02:00