AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-12 16:57:32 -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
13e1b22101 Added API entry to allow mods to register their own loot disks and EEPROMs. 
Reworked loot disk logic a bit, using factory callbacks producing file systems now.
 2015-05-14 20:45:19 +02:00
Florian Nücke
1a021995ba Block models stuff 1.8. 2015-05-14 16:43:37 +02:00
Florian Nücke
4d87baeeb7 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/block/ChameliumBlock.scala
	src/main/scala/li/cil/oc/common/block/Keyboard.scala
	src/main/scala/li/cil/oc/common/block/SimpleBlock.scala
	src/main/scala/li/cil/oc/common/init/Blocks.scala
	src/main/scala/li/cil/oc/server/agent/Player.scala
 2015-05-14 16:28:20 +02:00
Florian Nücke
611f76c158 Added fake endstone, oredicted that and normal endstone for use in drone recipe. 
Because someone was nagging about vanilla MC balance. As if there were such a thing :P
 2015-05-14 16:07:30 +02:00
Florian Nücke
e27b7bf7f1 Slow block breaking for robots and drones. 
Beware: this means that swing() may now return true even though the robot didn't really break the block (in case something else broke it before the robot finished).
 2015-05-14 15:07:33 +02:00
Florian Nücke
df15411a61 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-05-12 14:40:36 +02:00
Florian Nücke
ac853b9241 Fixed doc string pattern for NEI handler to not be greedy. Also fixes behavior for multiline doc strings. Closes #1143. 2015-05-12 14:40:12 +02:00
Florian Nücke
2afa10e8f3 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/Environment.scala
	src/main/scala/li/cil/oc/server/network/Network.scala
 2015-05-12 13:22:30 +02:00
Florian Nücke
a03966748e Trying to keep tablets running across dimension changes, closes #1145, closes #1146. 
Somewhat hacky, seems to work fine from initial tests (single and multiplayer) but will need broader testing.
 2015-05-12 12:18:27 +02:00
Florian Nücke
9deaf7101f Fixes #1147. 
Apparently the integrated server isn't ready to receive our packets soon enough for this to work, so sending own visibility info only after receiving visibility info from the server, now.
 2015-05-12 11:10:14 +02:00
Florian Nücke
4ce73e6413 Minor cleanup. 2015-05-10 15:16:58 +02:00
Florian Nücke
eee133dfed Added support for AE2's spatial I/O (i.e. moving computers etc. into spatial storage cells). 
Somewhat hacky, to avoid computers resetting, but seems to work.
 2015-05-10 15:16:50 +02:00
Florian Nücke
5413a2a320 Added special handling for "phantom slots" in shift-click logic, closes #1139. 2015-05-10 12:04:24 +02:00
Florian Nücke
a8a91cd6fb 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/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
	src/main/scala/li/cil/oc/common/IMC.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/integration/opencomputers/ModOpenComputers.scala
 2015-05-09 16:37:05 +02:00
Florian Nücke
3bdb3a3335 Dogfooding IMC helper class. 2015-05-09 16:23:48 +02:00
Florian Nücke
3d63c9a767 Added IMC helper class to API. 
Primarily to document IMC messages, but also to make it a little easier to use if you know the API is present anyway.
 2015-05-09 16:22:34 +02:00
Florian Nücke
ba6053ab0c Added IMC callback to add custom ink providers (i.e. callbacks that let us know how much ink an item is worth). Closes #1135. 2015-05-09 12:01:37 +02:00
Florian Nücke
1ecd5063af Fixed driver for AE2 export bus derpiness. Might also fix #1137. 2015-05-09 11:46:56 +02:00
Florian Nücke
dc0c26f1d6 Fixed printer shape limit test being off by one. 2015-05-09 11:46:16 +02:00
Florian Nücke
dce3bf1524 Rebind primary screen to primary GPU if necessary. 
Can happen if when after loading a connection between GPU and screen is not present before components get first updated. Mainly to avoid derping in combination with for AE2 P2P tunnels.
 2015-05-07 22:52:12 +02:00
Florian Nücke
0fa5fcbafe Append instead of prepend CC return port in network messages. 2015-05-05 16:50:42 +02:00
Florian Nücke
fbc7368f70 Added waypoint and hover upgrade to index pages in manual. 2015-05-04 20:52:43 +02:00
Florian "Sangar" Nücke
a78c1b6b3c Merge pull request #1128 from cyber01/RU_doc 
Corrected mistakes / Added hover upgrade to Russian translation.
 2015-05-04 20:45:37 +02:00
Florian Nücke
c4b3e0d3a5 Wrapping exceptions thrown in CC callbacks in LuaExceptions for nicer formatting on the Lua side. Closes #1126. 2015-05-04 20:43:58 +02:00
Florian Nücke
fda0c53c7f Make access points report false for isWireless via their fake modem peripheral. 
Allows using components behind them as remote peripherals, too (not just via the switch).
Added new method for checking if it's actually an access point, in case that's needed.
 2015-05-04 20:39:46 +02:00
Florian Nücke
b60466c8b8 Made argument parsing for CC modem emulation more forgiving, avoids crashing computers. 2015-05-04 19:20:06 +02:00
cyber01
c77eef2966 Added waypoint to index.md 2015-05-04 19:49:46 +03:00
cyber01
c2798c365d Corrected mistakes/ Added hover upgrade 2015-05-04 19:45:42 +03:00
Florian Nücke
8c9f9749b1 Should fix duplicate equipped item rendering on powered-off robots... again... 2015-05-04 16:01:52 +02:00
Florian Nücke
5b0e896f6f Added getter for players online as well as registered dimensions to debug card. Closes #1122. 2015-05-04 11:33:20 +02:00
Florian Nücke
48b4bed67a Custom implementation of ClassWriter#getCommonSuperClass to compensate for recent change in Forge, should fix #1121. 2015-05-04 11:07:50 +02:00
Florian Nücke
e17134e8ec Bump version. 2015-05-04 02:37:27 +02:00
Florian Nücke
5c6771edf5 Should fix MFR Safari Net converter in newer versions. 2015-05-04 02:37:20 +02:00
Florian Nücke
b1d91ee406 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-05-03 16:14:15 +02:00
Florian Nücke
6851128cc2 Add support for generic recipes in recipe declaration (i.e. arbitrary output). 
Added recipe for end stone, for people that absolutely, positively can't be bothered to go to the end, but still want drones...
 2015-05-03 16:10:27 +02:00
Florian Nücke
2e634a0bfc Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-05-02 21:36:36 +02:00
Florian Nücke
b96204dc56 Should fix #1119. 2015-05-02 21:36:18 +02:00
Florian "Sangar" Nücke
ec4611c082 Merge pull request #1118 from Kubuxu/master-MC1.7.10 
Allow [name]/init.lua in require.
 2015-05-02 16:56:01 +02:00
Kubuxu
b55641b722 Allow [name]/init.lua in require. 
This change allows to store complex libraries in one directory.
 2015-05-02 16:47:16 +02:00
Florian Nücke
575dc73aad 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
 2015-05-02 14:08:04 +02:00
Florian Nücke
d2b51db61d Storing and restoring OpenGL attribs in robot renderer. 
May help with some things rendering incorrectly if rendered after the robot, otherwise. Possibly.
 2015-05-02 14:05:22 +02:00
Florian Nücke
c5eec99d75 Allow experience upgrade to consume bottles of enchanting and enchanted items for experience. 
Kind of a late implementation for #129 :P
 2015-05-01 22:44:05 +02:00
Florian Nücke
208c5b65e4 Added note in tooltip of microcontroller (and robot while at it) that they cannot connect to external components. 
Should hopefully save people some head-scratching in the future.
Could have sworn the tooltip said that already, but was only the robot. Oh well!
 2015-05-01 16:47:22 +02:00
Florian Nücke
b2dfdd25ee Don't initialize BluePower integration if present version is too old. Closes #1114. 
Yay for API changes that are not reflected in minor/major version numbers \o/
 2015-05-01 15:04:12 +02:00
Florian Nücke
aca1dd0dcc Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-05-01 12:17:52 +02:00
Florian Nücke
e028924d61 Added -x option to cp.lua to allow not copying mounts, used in install.lua to avoid recursively copying target mount to itself. 
Fixed deobf build shipping parts of the Railcraft API... sometimes Gradle confuses me greatly.
 2015-05-01 12:16:55 +02:00
Florian Nücke
5f1c6af0f3 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-05-01 11:51:25 +02:00
Florian Nücke
19afcabb7f Fixed piping broken in previous commit, also improved it a little. 
Also make yes.lua handle closed output stream instead of bubbling the error (e.g. when program it pipes to finishes).
 2015-05-01 11:51:06 +02:00
Florian Nücke
6b80b75fd3 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-05-01 10:47:51 +02:00
Florian Nücke
d77bc3d3d7 Added -u flag to cp.lua, added -u flag to install.lua. Closes #1092. 
Run `/mnt/???/bin/install.lua -u` to update OpenOS more comfortably now, asks for each changed file, to avoid blindly overwriting user-changed files.
Made install.lua a bit more clever, looking for an actual mount point for an address, not blindly hoping that `/mnt/(first three chars of address)` exists. Also made it use the cp.lua on its own file system (since that's needed for updating the first time, e.g.).
 2015-05-01 10:46:13 +02:00