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

1977 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
7c552fe060 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-25 22:10:54 +02:00
Florian Nücke
e3d3e3c7f9 Apparently gradle hates me. 2014-06-25 22:10:34 +02:00
Florian Nücke
99dc703a91 Porting to 1.7. 2014-06-25 21:24:15 +02:00
Florian Nücke
521757e50e Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/common/Proxy.scala
	src/main/scala/li/cil/oc/common/item/RedstoneCard.scala
 2014-06-25 21:19:28 +02:00
Florian Nücke
40dc7c5df0 Added T2 redstone card. Closes #340. 
T1 is now vanilla functionality (simple, analog redstone signals), T2 is for mod interop (bundled redstone, wireless redstone). Existing redstone cards are automatically converted to T2 cards, to avoid breaking things more than necessary. Redstone blocks behave like T2 cards, but without the wireless support.
 2014-06-25 21:14:06 +02:00
jamesb6626
4c8b33e5d9 Fix problem pointed out by fnuecke 
Changed 1 and 0 to true and false
 2014-06-25 16:48:15 +01:00
Florian Nücke
fd8ecbc391 Merge branch 'tablet' 2014-06-25 13:56:40 +02:00
Florian Nücke
e5a6905a60 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-25 13:35:59 +02:00
Florian Nücke
ac8b490229 Brought back the workaround for IC2 not giving a damn about the returned value from energy injection (and therefore energy getting lost). Closes #348. 2014-06-25 13:35:35 +02:00
Florian Nücke
1d4842ebc2 Fixes #359. 2014-06-25 13:22:17 +02:00
jamesb6626
41579f85bc Merge remote-tracking branch 'upstream/master' 2014-06-24 16:52:25 +01:00
Florian Nücke
2982889f4b Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	build.properties
 2014-06-24 17:37:10 +02:00
Florian Nücke
6f755c6b68 Should fix #350. 
Bump version to RC1.
 2014-06-24 17:35:54 +02:00
jamesb6626
6164d6f0c0 Add more controls for more.lua command + tidy up 
Added more keys for the command to recognise ("page down" goes to the next page in the same way as "space", "enter" and "down" print just the next line)
Moved the code to print lines from the file to a function to reduce the space used by repeating it for the new keys
 2014-06-24 14:24:10 +01:00
Florian Nücke
94201c7d32 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-23 23:34:13 +02:00
Florian Nücke
9531819ee1 Avoid NPE when a computer's readFromNBT is called on client side by other mods. 2014-06-23 23:33:20 +02:00
Florian Nücke
7e5564783b Made io.open resolve paths relative to the current working directory. Closes #354. 2014-06-23 23:08:37 +02:00
Florian Nücke
f8026c9310 Some fixes and a texture for the tablet prototype. 2014-06-22 23:07:44 +02:00
Florian Nücke
b8cb9b672b Merge branch 'master' of github.com:MightyPirates/OpenComputers into tablet 
Conflicts:
	src/main/scala/li/cil/oc/Items.scala
	src/main/scala/li/cil/oc/client/GuiHandler.scala
 2014-06-22 20:43:28 +02:00
Florian Nücke
5a36e1eea9 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-22 20:40:52 +02:00
Florian Nücke
4532186439 Made shift-click logic in container GUIs less derpy when involving 'damageable' items (e.g. batteries). 2014-06-22 20:40:31 +02:00
Florian Nücke
d3560d17b6 Fixed fs.path returning double slash for elements in root. 2014-06-22 19:13:19 +02:00
Florian Nücke
9933b85e24 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-22 16:41:46 +02:00
Florian Nücke
3ef3413586 Fixed wget not closing and deleting files when erroring while downloading. 
Made wget more friendly when used by other programs, added -Q option (superquit, no output whatsoever).
 2014-06-22 16:39:33 +02:00
Florian Nücke
00c067f642 Fixed something that doesn't fix anything. 2014-06-22 15:19:04 +02:00
Florian Nücke
508dc64553 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-22 01:21:53 +02:00
Florian Nücke
e7e04d91aa Added getter to hologram to determine color support (tier). 
Adjusted palette color getter/setter in hologram to use same indexes as when setting (i.e. starting at 1, with 0 being reserved for blank).
 2014-06-22 01:21:34 +02:00
Florian Nücke
8f0eaeae09 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/client/PacketHandler.scala
	src/main/scala/li/cil/oc/client/renderer/PetRenderer.scala
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/common/Proxy.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/Environment.scala
	src/main/scala/li/cil/oc/server/PacketHandler.scala
 2014-06-21 22:45:36 +02:00
Florian Nücke
1cd65bd2b3 Fixed screen GUI size not being properly updated when Minecraft windows was resized. 2014-06-21 21:49:11 +02:00
Florian Nücke
b91c8e839d Left-aligned bluescreen messages and replacing tabs with two spaces to avoid the question marks. 2014-06-21 21:16:59 +02:00
Florian Nücke
7cd99e8e79 Moved the _OSVERSION global to OpenOs's init script, where it should be now. 2014-06-21 19:55:15 +02:00
Florian Nücke
fed7007259 Allow getting robot name via robot.player().getDisplayName(). 2014-06-21 16:42:13 +02:00
Florian Nücke
b236b01dd0 Moved some stuff into centralized event handler to sync that up with 1.7 better. 2014-06-21 16:41:04 +02:00
Wuerfel_21
d553f4e065 Fixed typo 
derp
 2014-06-21 12:06:20 +02:00
Florian Nücke
ba359aff43 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/server/component/UpgradeSign.scala
 2014-06-21 01:30:16 +02:00
Florian Nücke
55c5a25613 Fixed coordinates being computed incorrectly in some quadrants (I should really read my own javadoc...). Fixes #344. 2014-06-21 01:27:03 +02:00
Florian Nücke
6a9f91dda8 Lolololdebugprintln. 2014-06-20 23:13:42 +02:00
Florian Nücke
664d715539 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-20 23:12:44 +02:00
Florian Nücke
2015514b97 Fixed registration for ClientTickEvents. 2014-06-20 23:12:23 +02:00
Florian Nücke
ffb2ab7e01 Showing proper 'CPU is missing' message when turning on computers without CPU that have no components attached. 2014-06-20 23:11:46 +02:00
Florian Nücke
fd630738ef Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/client/GuiHandler.scala
	src/main/scala/li/cil/oc/client/PacketHandler.scala
	src/main/scala/li/cil/oc/client/Proxy.scala
	src/main/scala/li/cil/oc/client/gui/Case.scala
	src/main/scala/li/cil/oc/client/gui/Rack.scala
	src/main/scala/li/cil/oc/client/gui/Robot.scala
	src/main/scala/li/cil/oc/client/gui/RobotAssembler.scala
	src/main/scala/li/cil/oc/common/ConnectionHandler.scala
	src/main/scala/li/cil/oc/common/block/AccessPoint.scala
	src/main/scala/li/cil/oc/common/block/Capacitor.scala
	src/main/scala/li/cil/oc/common/block/Case.scala
	src/main/scala/li/cil/oc/common/block/Charger.scala
	src/main/scala/li/cil/oc/common/block/DiskDrive.scala
	src/main/scala/li/cil/oc/common/block/Hologram.scala
	src/main/scala/li/cil/oc/common/block/Keyboard.scala
	src/main/scala/li/cil/oc/common/block/Screen.scala
	src/main/scala/li/cil/oc/common/event/ExperienceUpgradeHandler.scala
	src/main/scala/li/cil/oc/common/item/Analyzer.scala
	src/main/scala/li/cil/oc/common/tileentity/Charger.scala
	src/main/scala/li/cil/oc/common/tileentity/Geolyzer.scala
	src/main/scala/li/cil/oc/common/tileentity/Rack.scala
	src/main/scala/li/cil/oc/common/tileentity/Robot.scala
	src/main/scala/li/cil/oc/common/tileentity/WirelessRouter.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala
	src/main/scala/li/cil/oc/server/PacketHandler.scala
	src/main/scala/li/cil/oc/server/component/machine/Machine.scala
	src/main/scala/li/cil/oc/util/ItemCosts.scala
	src/main/scala/li/cil/oc/util/Tooltip.scala
 2014-06-20 23:08:20 +02:00
Florian Nücke
bc8c29812f Fixed primaries being determined using the fuzzy component.list getter by adding a second parameter to list, exact, which will suppress fuzzy search. 
This prevents the inventory controller upgrade to be returned for `component.inventory`, for example, and will only return it for `component.inventory_controller` now, as was originally intended.
 2014-06-20 22:10:43 +02:00
Florian Nücke
64bf4d67e4 Super-secret feature. 2014-06-20 22:06:00 +02:00
Florian Nücke
79c202fe21 Refactored localization stuff into a single class. Decided I didn't like those duplicate strings flying around all over the place. 2014-06-20 12:52:26 +02:00
Wuerfel_21
1f1a97e007 This is for linux purists 
...
 2014-06-20 10:15:52 +02:00
Wuerfel_21
084aa8ab43 Made ls display amount of dirs/files 
Self explanatory
 2014-06-19 23:59:17 +02:00
Florian Nücke
1966455155 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/server/network/Network.scala
 2014-06-19 21:54:23 +02:00
Florian Nücke
56f46cb923 Fixes #341 (again). 2014-06-19 21:51:04 +02:00
Florian Nücke
97ebba3393 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/Router.scala
 2014-06-19 20:23:46 +02:00
Florian Nücke
9cd30460a1 Should fix #341. 2014-06-19 20:22:29 +02:00