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

2028 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
8b1db646d6 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/java/li/cil/oc/api/prefab/TileEntitySidedEnvironment.java
 2014-03-12 06:49:12 +01:00
Florian Nücke
8a8a5d6d86 fixed comments in config getting duplicated when new settings were added (damn line endings...) 2014-03-12 06:48:22 +01:00
Florian Nücke
4967b79126 adjusted sound stuff to the 1.7 way 2014-03-12 05:33:01 +01:00
Florian Nücke
e581990bc2 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/client/Proxy.scala
	src/main/scala/li/cil/oc/common/tileentity/Computer.scala
	src/main/scala/li/cil/oc/common/tileentity/Rack.scala
 2014-03-12 04:00:40 +01:00
Florian Nücke
0d71363160 removed accidental scala from prefab in api 2014-03-12 03:59:26 +01:00
Florian Nücke
6b2e374563 added setting for computer running noise volume 2014-03-11 21:22:46 +01:00
Florian Nücke
f8a0b60abd robot label now moves smoothly with the robot; running sound for computers, robots and server racks; split sound class into server and client side 2014-03-11 21:17:34 +01:00
Florian Nücke
bb98121a82 forcing a new address onto nodes added to a network in which another node with that address already exists. this was possible in case of duplicated items (creative mode e.g.) 2014-03-11 16:42:35 +01:00
Florian Nücke
723dbda71c Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/client/renderer/WirelessNetworkDebugRenderer.scala
	src/main/scala/li/cil/oc/common/Proxy.scala
 2014-03-11 16:14:00 +01:00
Florian Nücke
7d95148d8b fixed class transformer for mods reobfed to notch names (i was *so* sure i tested this before...) 2014-03-11 15:49:26 +01:00
Florian Nücke
fa7da0536f added some more jdoc to api; added FluidTankInfo type converter; made robot interface extend rotatable 2014-03-11 12:44:19 +01:00
Florian Nücke
c8d7d569c9 organized imports 2014-03-11 00:19:01 +01:00
Florian Nücke
0890689b31 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/client/renderer/WirelessNetworkDebugRenderer.scala
	src/main/scala/li/cil/oc/common/Proxy.scala
	src/main/scala/li/cil/oc/common/tileentity/Hub.scala
	src/main/scala/li/cil/oc/common/tileentity/Router.scala
	src/main/scala/li/cil/oc/server/component/NetworkCard.scala
	src/main/scala/li/cil/oc/server/network/Network.scala
	src/main/scala/li/cil/oc/server/network/WirelessNetwork.scala
 2014-03-10 23:56:30 +01:00
Florian Nücke
73bdde3acb fixed auto tostring in pretty serialization; fixed files not being 'reset' when opening unbuffered files in write mode 2014-03-10 23:14:59 +01:00
Florian Nücke
ac1bb3847d disabled debug network rendering 2014-03-10 22:33:55 +01:00
Florian Nücke
cfff33cc4b Merge branch 'master' of https://github.com/MightyPirates/OpenComputers 
Conflicts:
	src/main/resources/assets/opencomputers/robot.names
 2014-03-10 22:32:36 +01:00
Florian Nücke
32cde6d2ad javadoc for wireless api 2014-03-10 22:31:20 +01:00
Johannes Lohrer
190414fd90 added robot names from perry rhodan 2014-03-10 22:18:36 +01:00
Florian Nücke
2ef86cfacc cleaning up network a lot; fixed cc comps not being able to send wireless messages via access points; started wireless api 2014-03-10 22:07:56 +01:00
Florian Nücke
0f0843e4dd Merge pull request #158 from Wobbo/master 
Added some pionering robots to the list
 2014-03-10 21:24:33 +01:00
René Mellema
1829fcc79d Update robot.names 2014-03-10 21:24:03 +01:00
Wobbo
77b055a581 Added some pionering robots to the list 2014-03-10 21:20:51 +01:00
Florian Nücke
de00d886d2 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers 2014-03-10 18:55:20 +01:00
Florian Nücke
ed0090e60e actually applying type converters; added itemstack converter 2014-03-10 18:55:09 +01:00
Florian Nücke
e3d0bfa2c4 fixed pretty serialization for tables with mixed typed keys 2014-03-10 18:50:04 +01:00
Florian Nücke
afcc04c90c added type converter api. doesn't do anything yet, only allows registering converters. 2014-03-10 17:51:10 +01:00
Florian Nücke
17855e6ef1 Merge pull request #157 from JoshTheEnder/master 
Update robot.names
 2014-03-10 17:38:42 +01:00
Josh
282d3cfd56 Update robot.names 
Added Terminator T-1000, HAL 9000 and Robot Devil to robot names
 2014-03-10 16:33:15 +00:00
Florian Nücke
70a41da475 adjustment for 1.7 2014-03-10 14:20:24 +01:00
Florian Nücke
35a0b05921 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/resources/mcmod.info
	src/main/scala/li/cil/oc/UpdateCheck.scala
	src/main/scala/li/cil/oc/common/Proxy.scala
	src/main/scala/li/cil/oc/common/item/Delegator.scala
 2014-03-10 14:18:44 +01:00
Florian Nücke
ce9fccde7a made mcmod.info autoversion via gradle (kinda forgot about that...), had to change modinfo format for that to work (for whatever reason... search and replace doesn't work in nested json? o.O); added safety net to update checker 2014-03-10 14:15:19 +01:00
Florian Nücke
afa338ca6e updated mod info to new authors field name... 2014-03-10 13:21:09 +01:00
Florian Nücke
98ae923da4 added readme on loot disks 2014-03-10 01:57:59 +01:00
Florian Nücke
f4b07c77f5 cleaned up loot system (custom random class to allow selecting actual disk without messing up the weights - which would have failed with > 5 disks, because of integer division); made besh and irc program first loot disks; avoid breaking disks on insertion due to loot path nbt tag getting wiped; playing correct fs access sounds in robot and playing insert/eject sounds 2014-03-10 01:48:44 +01:00
Johannes Lohrer
7fded0afea Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-03-09 23:48:27 +01:00
Johannes Lohrer
e1d774ca79 Added loot logic for creating floppy disks 2014-03-09 23:48:15 +01:00
Florian Nücke
402f86b31c Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	build.properties
	src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
 2014-03-09 23:02:39 +01:00
Florian Nücke
07b4fda9b4 cleaned up robot label renderer a little; bumped version 2014-03-09 23:01:30 +01:00
Florian Nücke
2b5294821d Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/client/Proxy.scala
	src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
	src/main/scala/li/cil/oc/common/PacketBuilder.scala
	src/main/scala/li/cil/oc/common/block/Hologram.scala
	src/main/scala/li/cil/oc/common/tileentity/DiskDrive.scala
	src/main/scala/li/cil/oc/common/tileentity/Robot.scala
	src/main/scala/li/cil/oc/server/component/FileSystem.scala
 2014-03-09 21:42:38 +01:00
Florian Nücke
667287434f forgot to bump the api version number for the added file system factory method 2014-03-09 21:09:52 +01:00
Florian Nücke
09342e9f08 added setting to disable robot label rendering, in case it annoys people 2014-03-09 20:48:29 +01:00
Florian Nücke
cbdb4f19ad robots could be - unintentionally - be renamed in the anvil. now they keep their name, and get a random name when first placed! also, their name is rendered as a label above them, similar to player names. 2014-03-09 20:45:24 +01:00
Florian Nücke
d7fcbd9c38 removed debug print from irc.lua 2014-03-09 19:45:59 +01:00
Florian Nücke
717aaa3e78 hdd access sounds and playing access sounds in a few more cases (e.g. list, remove, rename); avoid spamming network packets if sounds are triggered in a tight loop 2014-03-09 18:57:16 +01:00
Florian Nücke
785caac5ae Merge branch 'master' of https://github.com/MightyPirates/OpenComputers 2014-03-09 18:42:23 +01:00
Florian Nücke
18e02adba6 fixed rendering of hologram block when below a solid block, closes #155 2014-03-09 18:42:13 +01:00
Florian Nücke
a31696db0c Merge pull request #154 from MichiyoRavencroft/patch-1 
Added 23 Numerics, and CTCP support.
 2014-03-09 18:37:34 +01:00
Caitlyn
f0d69fa04b Added 23 Numerics, and CTCP support. 
Also changed error handling to give the output from unhanded numerics.
 2014-03-09 11:48:37 -05:00
Florian Nücke
6fdde8a2ac fixed disk access sounds not playing for cc floppies; attribution to asset contributors in license file 2014-03-09 17:27:25 +01:00
Florian Nücke
a1302e6eb6 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers 2014-03-09 17:13:33 +01:00