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

4305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
38bd133d1e Removed some very old config and block/item name patches. When directly upgrading from versions that old, stuff would break anyway. 2015-02-03 21:24:19 +01:00
Florian Nücke
82ab190544 Made memory architecture agnostic, archs now determine on their own how memory tier / scale maps to physical memory size. 
Reworked MachineHost a bit, it's now much slimmer, only needs to provide the list of internally installed itemstacks, machine computes stuff it needs based on that. Much less duplicate code!
 2015-02-03 21:20:53 +01:00
Florian Nücke
fb0a9a33dd Update handlers for agent based events. 2015-02-03 19:05:51 +01:00
Florian Nücke
664bfcfeca Pulled machine getter into MachineHost, adding that as super to machine related internal interfaces. 2015-02-03 18:49:02 +01:00
Florian Nücke
578df68bc7 Changed GeolyzerEvent.Analyze to take an absolute position instead of the side of the host for more flexibility. 2015-02-03 17:10:41 +01:00
Florian Nücke
9c86caa7da Removed deprecated stuff. 2015-02-03 17:04:54 +01:00
Florian Nücke
298d97639e Started reworking API for 1.5. 2015-02-03 16:59:04 +01:00
Florian Nücke
806dda8827 Fixes robots dropping the remainder of a slot's content instead of the number specified to drop; closes #885. 2015-02-03 12:57:05 +01:00
Florian Nücke
5381e9d2d2 Typesafe config is provided by Forge now, no need to have the license in the repo anymore. 2015-02-03 12:37:26 +01:00
Florian Nücke
7bc101e54e Updated Waila integration, re-enabled VersionChecker integration (untested). 2015-02-03 02:25:53 +01:00
Florian Nücke
57b8968060 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/common/block/Case.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/item/Analyzer.scala
	src/main/scala/li/cil/oc/common/tileentity/Screen.scala
	src/main/scala/li/cil/oc/server/component/DebugCard.scala
	src/main/scala/li/cil/oc/server/component/Geolyzer.scala
 2015-02-03 01:39:50 +01:00
Florian Nücke
596ba6f2c1 All the vals! Also removed minor oddity. 2015-02-02 23:19:01 +01:00
Florian Nücke
f69250b565 Added ability to copy lines from screens using the analyzer (shift-rightclicking the line with the analyzer), then paste it on a screen by simply rightclicking it with the analyzer. Closes #644. 2015-02-02 23:05:21 +01:00
Florian Nücke
16170e31ee Bumped remote terminal resolution and color depth to tier three, to keep them competitive with tablets with container slots. Closes #822. 
Will need breaking and re-placing server racks to work in existing worlds (because max res is saved now).
 2015-02-02 20:57:21 +01:00
Florian Nücke
cea9c1cdbc Added debug.insertFluid and debug.removeFluid, closes #882. 2015-02-02 19:12:32 +01:00
Florian Nücke
e5d8f3ab5d Disallow breaking creative tier robots by non-creative, non-authorized players. Closes #868. 
Also fixed visual desync when "breaking" a creative case.
 2015-02-02 18:48:45 +01:00
Florian Nücke
b136e2ab7f Added inventory_controller.compareToDatabase, closes #861. 2015-02-02 18:05:50 +01:00
Florian Nücke
5a4dedf6d1 Right-clicking blocks with tablet in hand will now allow components to populate a data table. If any is given, a tablet_use signal is sent to the tablet, with the data passed as a table as the only parameter for the signal. Closes #858. 2015-02-01 23:38:43 +01:00
Florian Nücke
0fdbd38643 Allow pushing NBTTagCompounds as signals and added converter for NBTTagCompound. 2015-02-01 23:02:11 +01:00
Florian Nücke
2aa0b08b23 Adjusted MCVersion of TransformerLoader. 2015-02-01 16:13:05 +01:00
Florian Nücke
d952c809af Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-02-01 15:14:58 +01:00
Florian Nücke
8092fae0a1 Revert using addresses in VFS back to using proxy objects, since I probably won't ever come around to actually implement mounts and symlinks being saved across reboots anyway. Closes #879. 
This [partially] reverts commit 42040e2da654d23a74386c5f188aa0053646c100.

Conflicts:
	src/main/resources/assets/opencomputers/loot/OpenOS/lib/filesystem.lua
 2015-02-01 15:10:26 +01:00
Florian Nücke
e6668d59b4 Limiting number of parts allowed in network packets as a safeguard for weaker computers, as discussed in #876. Configurable, of course. 2015-02-01 14:47:57 +01:00
Florian Nücke
c30d5b29ff Gnah, missed one. Should *fully* fix #859 now. 2015-02-01 14:27:50 +01:00
Florian Nücke
10c7276ecf Merge branch 'sides-idiom' of https://github.com/benblank/OpenComputers into master-MC1.7.10 2015-02-01 14:14:51 +01:00
Florian Nücke
286c98e438 Adjusted tablet case rendering for 1.8 and cleared out setting migrations. 2015-02-01 03:10:49 +01:00
Florian Nücke
98f76e6507 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/java/li/cil/oc/api/API.java
	src/main/resources/assets/opencomputers/textures/items/TabletCase.png
	src/main/resources/assets/opencomputers/textures/items/TabletCase0.png
	src/main/resources/assets/opencomputers/textures/items/tabletCase.png
	src/main/scala/li/cil/oc/client/GuiHandler.scala
	src/main/scala/li/cil/oc/common/Proxy.scala
	src/main/scala/li/cil/oc/common/init/Items.scala
	src/main/scala/li/cil/oc/common/item/Tablet.scala
	src/main/scala/li/cil/oc/common/item/data/TabletData.scala
	src/main/scala/li/cil/oc/common/tileentity/Hologram.scala
	src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala
	src/main/scala/li/cil/oc/common/tileentity/Switch.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala
	src/main/scala/li/cil/oc/integration/Mods.scala
	src/main/scala/li/cil/oc/integration/util/Waila.scala
	src/main/scala/li/cil/oc/server/CommandHandler.scala
	src/main/scala/li/cil/oc/server/component/UpgradeCrafting.scala
 2015-02-01 02:31:43 +01:00
Florian Nücke
4edeb0a1b8 Added new command, /oc_preventDisassembling (alias: /oc_nodis), which will mark the currently held item so that the disassembler will not work for it. Closes #875. 2015-02-01 00:28:39 +01:00
Florian Nücke
d870d376aa Slightly reworked logic of crafting upgrade to also support repairing items, fixes #874. Doesn't appear to break everything else. 2015-02-01 00:06:43 +01:00
Florian Nücke
fb8cca23ab Make strings count at least one towards a packet size, avoids creation of large packets by using empty strings. Fixes #876. 2015-01-31 23:28:54 +01:00
Florian Nücke
ecf6ee76d4 Added driver for IDeepStorageUnit. Closes #871. 
Using separate "mod" based on interface presence so it also works for mods using and shipping the interface when MFR isn't present (such as JABBA).
 2015-01-30 22:21:55 +01:00
Florian Nücke
89b8dbeb05 Version bump. 2015-01-30 21:11:52 +01:00
Florian Nücke
b0a4e8f857 Added tier two and creative tablet cases. 
Tier two and creative case also have space for a single container. When shift-rightclicking them, in addition to be powered off a GUI will open, giving access to the container slot, so you can, for example, insert and remove floppies on the go.
Also, tablet icons should be updated to reflect the tablet's run state more promptly now.
 2015-01-30 21:11:35 +01:00
Florian Nücke
a7a264b950 Added interface to allow more finegrained control over CC peripheral blacklisting for peripheral wrapper driver. Closes #865. 2015-01-30 17:43:59 +01:00
tmpvaracc
adc72c2304 Update robot.names 
Would be nice to see either of these AI names from Deus Ex francize to be implemented into list, haha
 2015-01-30 11:57:06 +03:00
Florian Nücke
3bec2b38c7 Lowered default geolyzer noise value based on Wobbo's magnificent box blots. 2015-01-30 01:14:04 +01:00
Florian Nücke
e4f51f6b99 Welp, looks like Waila may still call TileEntity.writeToNBT on the client side, so welcome back, check. 2015-01-30 00:45:42 +01:00
Florian Nücke
e794dcb92d Fixed rendering of robots' equipped item. 2015-01-29 19:18:42 +01:00
Florian Nücke
c2e131e67f Fixed robot fake player vertical offset (Entity.setLocationAndAngles sneakily changed, not applying the yOffset anymore). 2015-01-29 19:18:24 +01:00
Florian Nücke
c87d09f076 Saving robot rotation might be a good idea. 2015-01-29 18:17:23 +01:00
Florian Nücke
9dd89ba235 Fixed TESR's occasionally not rendering correctly. 2015-01-29 14:59:39 +01:00
Florian Nücke
1a4202eda2 Adjusted for earlier refactoring. 2015-01-29 13:35:56 +01:00
Florian Nücke
6de6dfbb83 Revert "Killed remote terminals. More power to tablets!" 
This reverts commit a804769abd49c2566e15cf25713b66de36e28bef.

Conflicts:
	src/main/resources/assets/opencomputers/lang/en_US.lang
	src/main/scala/li/cil/oc/common/init/Items.scala
	src/main/scala/li/cil/oc/common/item/Server.scala
 2015-01-29 13:27:09 +01:00
Florian "Sangar" Nücke
ad6a1cced9 That's not the wiki. 2015-01-29 13:05:36 +01:00
Ben Blank
4b94b61faf make the Sides API less suprising when used with the # operator and ipairs function 2015-01-28 17:46:22 -08:00
Florian Nücke
ee6a2d9d08 1.8 adjustments. 2015-01-29 01:43:10 +01:00
Florian Nücke
d1f7899c4c Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-01-29 01:40:53 +01:00
Florian Nücke
aeafac4df3 Added debug.removeItem for removing items from inventories. Closes #866. 2015-01-29 00:11:58 +01:00
Florian Nücke
2f9779cb76 Added play and stop methods to jukebox driver. Closes #862. 2015-01-28 23:27:38 +01:00
Florian Nücke
78d6ea15d2 Added setting for whether to enable command block driver or not; defaulting to false. 2015-01-28 22:17:01 +01:00