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

1837 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Florian Nücke
37f4e26008 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/CreativeTab.scala
	src/main/scala/li/cil/oc/OpenComputers.scala
	src/main/scala/li/cil/oc/Settings.scala
	src/main/scala/li/cil/oc/UpdateCheck.scala
	src/main/scala/li/cil/oc/client/GuiHandler.scala
	src/main/scala/li/cil/oc/client/KeyBindings.scala
	src/main/scala/li/cil/oc/client/Proxy.scala
	src/main/scala/li/cil/oc/client/Sound.scala
	src/main/scala/li/cil/oc/client/gui/Icons.scala
	src/main/scala/li/cil/oc/client/renderer/TextBufferRenderCache.scala
	src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/font/StaticFontRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/tileentity/HologramRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
	src/main/scala/li/cil/oc/common/ConnectionHandler.scala
	src/main/scala/li/cil/oc/common/CraftingHandler.scala
	src/main/scala/li/cil/oc/common/Loot.scala
	src/main/scala/li/cil/oc/common/PacketBuilder.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/SaveHandler.scala
	src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala
	src/main/scala/li/cil/oc/common/block/AccessPoint.scala
	src/main/scala/li/cil/oc/common/block/Cable.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/Delegate.scala
	src/main/scala/li/cil/oc/common/block/Disassembler.scala
	src/main/scala/li/cil/oc/common/block/DiskDrive.scala
	src/main/scala/li/cil/oc/common/block/Geolyzer.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/PowerConverter.scala
	src/main/scala/li/cil/oc/common/block/PowerDistributor.scala
	src/main/scala/li/cil/oc/common/block/Rack.scala
	src/main/scala/li/cil/oc/common/block/Redstone.scala
	src/main/scala/li/cil/oc/common/block/RedstoneAware.scala
	src/main/scala/li/cil/oc/common/block/RobotAfterimage.scala
	src/main/scala/li/cil/oc/common/block/RobotAssembler.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/block/Switch.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/container/ComponentSlot.scala
	src/main/scala/li/cil/oc/common/event/AngelUpgradeHandler.scala
	src/main/scala/li/cil/oc/common/event/ChunkloaderUpgradeHandler.scala
	src/main/scala/li/cil/oc/common/event/RobotCommonHandler.scala
	src/main/scala/li/cil/oc/common/event/TinkersConstructToolHandler.scala
	src/main/scala/li/cil/oc/common/event/UniversalElectricityToolHandler.scala
	src/main/scala/li/cil/oc/common/inventory/ComponentInventory.scala
	src/main/scala/li/cil/oc/common/inventory/ItemStackInventory.scala
	src/main/scala/li/cil/oc/common/item/Analyzer.scala
	src/main/scala/li/cil/oc/common/item/Delegate.scala
	src/main/scala/li/cil/oc/common/item/Delegator.scala
	src/main/scala/li/cil/oc/common/item/GraphicsCard.scala
	src/main/scala/li/cil/oc/common/item/IronNugget.scala
	src/main/scala/li/cil/oc/common/item/LinkedCard.scala
	src/main/scala/li/cil/oc/common/item/RedstoneCard.scala
	src/main/scala/li/cil/oc/common/item/Server.scala
	src/main/scala/li/cil/oc/common/item/UpgradeBattery.scala
	src/main/scala/li/cil/oc/common/item/UpgradeChunkloader.scala
	src/main/scala/li/cil/oc/common/item/UpgradeContainerCard.scala
	src/main/scala/li/cil/oc/common/item/UpgradeContainerUpgrade.scala
	src/main/scala/li/cil/oc/common/item/UpgradeInventoryController.scala
	src/main/scala/li/cil/oc/common/launch/TransformerLoader.scala
	src/main/scala/li/cil/oc/common/multipart/CablePart.scala
	src/main/scala/li/cil/oc/common/multipart/DelegatePart.scala
	src/main/scala/li/cil/oc/common/multipart/EventHandler.scala
	src/main/scala/li/cil/oc/common/recipe/Recipes.scala
	src/main/scala/li/cil/oc/common/tileentity/Adapter.scala
	src/main/scala/li/cil/oc/common/tileentity/Case.scala
	src/main/scala/li/cil/oc/common/tileentity/Disassembler.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/Redstone.scala
	src/main/scala/li/cil/oc/common/tileentity/Robot.scala
	src/main/scala/li/cil/oc/common/tileentity/RobotAssembler.scala
	src/main/scala/li/cil/oc/common/tileentity/Router.scala
	src/main/scala/li/cil/oc/common/tileentity/Screen.scala
	src/main/scala/li/cil/oc/common/tileentity/WirelessRouter.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/BundledRedstoneAware.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/Environment.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/Hub.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/Rotatable.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/TileEntity.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/Common.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/UniversalElectricity.scala
	src/main/scala/li/cil/oc/server/PacketHandler.scala
	src/main/scala/li/cil/oc/server/PacketSender.scala
	src/main/scala/li/cil/oc/server/TickHandler.scala
	src/main/scala/li/cil/oc/server/component/FileSystem.scala
	src/main/scala/li/cil/oc/server/component/Keyboard.scala
	src/main/scala/li/cil/oc/server/component/machine/LuaJLuaArchitecture.scala
	src/main/scala/li/cil/oc/server/component/machine/Machine.scala
	src/main/scala/li/cil/oc/server/component/machine/NativeLuaArchitecture.scala
	src/main/scala/li/cil/oc/server/component/machine/luac/UserdataAPI.scala
	src/main/scala/li/cil/oc/server/component/machine/luaj/UserdataAPI.scala
	src/main/scala/li/cil/oc/server/component/robot/Player.scala
	src/main/scala/li/cil/oc/server/component/robot/Robot.scala
	src/main/scala/li/cil/oc/server/driver/CompoundBlockDriver.scala
	src/main/scala/li/cil/oc/server/driver/CompoundBlockEnvironment.scala
	src/main/scala/li/cil/oc/server/driver/Registry.scala
	src/main/scala/li/cil/oc/server/driver/converter/ItemStack.scala
	src/main/scala/li/cil/oc/server/driver/item/ComputerCraftMedia.scala
	src/main/scala/li/cil/oc/server/fs/CC15WritableFileSystem.scala
	src/main/scala/li/cil/oc/server/fs/FileSystem.scala
	src/main/scala/li/cil/oc/server/fs/InputStreamFileSystem.scala
	src/main/scala/li/cil/oc/server/fs/OutputStreamFileSystem.scala
	src/main/scala/li/cil/oc/server/fs/VirtualFileSystem.scala
	src/main/scala/li/cil/oc/server/fs/ZipFileInputStreamFileSystem.scala
	src/main/scala/li/cil/oc/server/network/Network.scala
	src/main/scala/li/cil/oc/server/network/Node.scala
	src/main/scala/li/cil/oc/server/network/WirelessNetwork.scala
	src/main/scala/li/cil/oc/util/Audio.scala
	src/main/scala/li/cil/oc/util/ExtendedArguments.scala
	src/main/scala/li/cil/oc/util/ExtendedNBT.scala
	src/main/scala/li/cil/oc/util/InventoryUtils.scala
	src/main/scala/li/cil/oc/util/ItemCosts.scala
	src/main/scala/li/cil/oc/util/ItemUtils.scala
	src/main/scala/li/cil/oc/util/LuaStateFactory.scala
	src/main/scala/li/cil/oc/util/mods/ComputerCraft15.scala
 2014-06-19 16:35:37 +02:00
Florian Nücke
cf521f4b2a Organize the imports. ALL OF THEM. 2014-06-19 16:23:26 +02:00
Florian Nücke
049129040d Scalaified disk-insert-on-rightlick a little, made the sneak logic feel more... natural (in the context of MC that is, at least in my opinion). 
Made floppies pass sneak clicks through to disk drives to ensure consistent sneak logic.
 2014-06-19 16:02:31 +02:00
Florian Nücke
df4b1feddb Merge git://github.com/Kilobyte22/OpenComputers 2014-06-19 15:19:20 +02:00
Florian Nücke
66e7f25611 Organize import for the lulz. 2014-06-19 15:19:13 +02:00
Kilobyte22
744cd991a2 Made Disk Drives react to right clicks. 
Disk drives now react to right clicks in the following ways:
regular right click, holding a disk: insert disk. If there is already a disk inside it is ejected first
regular right click, otherwise: open GUI
shift right click: eject disk

Furthermore, added myself to robot list
 2014-06-19 10:52:07 +02:00
Florian Nücke
7a5b3e5e6f Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-18 14:03:52 +02:00
Florian Nücke
67321e73fe Actually using the TMPDIR env var where relevant. 2014-06-18 14:02:56 +02:00
Florian Nücke
5c17e003ef Merge git://github.com/Wuerfel21/OpenComputers 2014-06-18 13:49:59 +02:00
Florian Nücke
47d5d884cd Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/client/renderer/MonospaceFontRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/TextBufferRenderCache.scala
 2014-06-18 13:21:34 +02:00
Florian Nücke
580386acaa Fixed hardmode recipes for hard drives tier 2 and 3. 2014-06-18 13:16:32 +02:00
Florian Nücke
cfd8b5db16 Reworked font rendering system to be a little more generic. 
Added font renderer i've been tinkering with that generates character textures on the fly from an actual font, in the hopes of supporting arbitrary unicode one day. It's terribly broken, still, though.
 2014-06-18 13:10:30 +02:00
Wuerfel_21
aca9894e76 fixed random stuff 
well, title states.
and there is some random binary for you:
11000011 01011101
10101110 11001111
00100011 00110110
01011000 01110101
11101111 11010100
11100101 10010011
00011001 11100101
10000101 10100000
11011001 01110110 10000111 00111000 00010000 10011001 10100111 10111100
10000101 00010000 01010010 10111101 10011101 00010101 10010001 00001101
10110100 10101111
00110001 11010101
01011010 11000000
00000100 10101011
01011111 11001111
 2014-06-17 15:20:23 +02:00
Wuerfel_21
8ca7306f34 Made Histrory Length a EnvVar 
Well, there is it!
 2014-06-17 09:46:41 +02:00
Wuerfel_21
fe08db56cc Made history longer 
It was too short, i always needed to retype long commands
 2014-06-16 23:12:37 +02:00
Florian Nücke
e55b8dd808 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-16 22:10:24 +02:00
Florian Nücke
cbfe1dd25a Moved besh-specific documentation to extra manpage for bash, removed it from the simple shell's manpage. Closes #333. v1.3.0-beta.1 2014-06-16 22:10:00 +02:00
Florian Nücke
d8585771e8 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-16 21:51:45 +02:00
Florian Nücke
7d62262984 Fixed pseudo-racing condition in package relay of switches and co. that could increase the time it took to resend a packet. Closes #327. 2014-06-16 21:51:25 +02:00
Florian Nücke
70a0ec4043 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-16 17:17:35 +02:00
Florian Nücke
8f1cac9f9a Fixed variable expansion in shell. 2014-06-16 17:17:17 +02:00
Florian Nücke
807d8457b9 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-16 17:02:23 +02:00
Florian Nücke
82d1a8a955 Merge pull request #330 from Vexatos/patch-6 
Added OPPM loot disk.
 2014-06-16 17:01:13 +02:00
Vexatos
eaafbcaf9d Create oppm.cfg 2014-06-16 16:54:05 +02:00
Vexatos
ce982b15b5 Create autorun.lua 2014-06-16 16:51:37 +02:00
Vexatos
8a7b11b169 Create oppm.lua 2014-06-16 16:49:23 +02:00
Vexatos
e1add13ca1 Update loot.properties 2014-06-16 16:48:43 +02:00
Florian Nücke
1a9d86f610 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	build.properties
	src/main/scala/li/cil/oc/Settings.scala
 2014-06-16 14:53:57 +02:00
Florian Nücke
deac0eacb6 Added config file versioning for config updates. 2014-06-16 14:51:43 +02:00
Florian Nücke
af49a05437 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/common/tileentity/Charger.scala
 2014-06-16 00:18:20 +02:00
Florian Nücke
d2a7ac8ad5 Made the animation on the side of chargers only visible when there's actually enough power to charge. 2014-06-16 00:16:57 +02:00
Florian Nücke
1b48aed45c Possibly resolve some screen/terminal related glitches. 2014-06-15 23:43:22 +02:00
Florian Nücke
ae8633d0be Common mod presence check for CC since there's only the new API in 1.7 anyway. 2014-06-15 22:43:20 +02:00
Florian Nücke
2a5ae26163 Adjustments for 1.7. 2014-06-15 20:11:01 +02:00
Florian Nücke
965aafacbb Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-15 20:08:56 +02:00
Florian Nücke
4be565ef38 Re-compiled Windows natives against Win7 SDK, possibly preventing issues like #321. 
Made it so that computers and robots can also be powered on by being shift-rightclicked when not holding an item.
 2014-06-15 19:22:00 +02:00
Florian Nücke
53d5ef4423 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/server/component/machine/Machine.scala
 2014-06-15 18:11:56 +02:00
Florian Nücke
1cd40f31f3 Minor reformatting, removing tabs and reducing indentation to 2 in maze program, to make it more readable on ingame computers. 2014-06-15 17:51:52 +02:00
Florian Nücke
f82c0a3b76 Merge branch 'patch-4' of git://github.com/ReTeYeZ/OpenComputers 2014-06-15 17:42:44 +02:00