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

1499 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Florian Nücke
dd41cb45a4 basic sound framework for disk activity and floppy sounds (thanks to asie for providing the samples!) 2014-03-09 17:13:19 +01:00
Florian Nücke
d278c9bacf Merge pull request #153 from SpiritedDusty/patch-2 
Fixed forum link
 2014-03-09 17:00:09 +01:00
SpiritedDusty
34c3b68164 Fixed forum link 2014-03-09 08:59:36 -07:00
Florian Nücke
4c6af332bc Merge pull request #152 from Vexatos/patch-3 
All; the. punctionation,-.,-'''<^ (Updated de_DE.lang)
 2014-03-09 15:00:42 +01:00
Florian Nücke
55b9eb3f2b Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/server/component/machine/Machine.scala
 2014-03-09 12:34:12 +01:00
Florian Nücke
f759a06ee3 fixed class transformer in deobf jar 2014-03-09 12:32:00 +01:00
Vexatos
4f6a99df4d All; the. punctionations,-.,-'''<^ 2014-03-09 11:56:52 +01:00
Florian Nücke
ed43b7fe31 cleaned up gradle scripts a little more (pulled version out of base name) 2014-03-09 11:49:48 +01:00
Florian Nücke
dfa24ac35c trying to stabilize the class transformer a little 2014-03-09 11:25:54 +01:00
Florian Nücke
9da741c618 adding saves/[world]/opencomputers/rom/[arch] folder to composite fs for machines, allows easy overriding/adding of stuff in/to the rom without editing the jar; fixed list() in composite fs 2014-03-09 10:43:14 +01:00
Florian Nücke
72abf79b36 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-08 23:09:15 +01:00
Florian Nücke
f0a5945fc3 fixed class name lookup in class transformer when deobfed-to-srg 2014-03-08 23:08:49 +01:00
Florian Nücke
baf007a72a Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-08 22:09:09 +01:00
Florian Nücke
94c1e00399 gradle ate my manifest, so i made it give it back to me 2014-03-08 22:08:48 +01:00
Florian Nücke
92e1abad17 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-08 21:50:11 +01:00
Florian Nücke
0fe1d68935 properly checking index bounds in hologram callbacks, avoids potential crash in update when invalid ones are passed 2014-03-08 21:45:06 +01:00
Florian Nücke
ed7f2f0a21 aaand fixed the return route, too... (cc -> oc networking) 2014-03-08 21:34:14 +01:00
Florian Nücke
d21af5356f Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-08 20:57:56 +01:00
Florian Nücke
aed13e341c Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/Proxy.scala
 2014-03-08 20:57:16 +01:00
Florian Nücke
261aecd6e8 properly synchronizing hologram update to avoid errors when updating the hologram while sending the state 2014-03-08 20:56:13 +01:00
Florian Nücke
20ec45bacd rom isn't shared among computers anymore (i.e. shared handles); fixed swtich block not queuing cc events 2014-03-08 20:52:59 +01:00
Florian Nücke
5b164bd325 basic system for registering file systems for lookup in a machine's rom. this allowed cleaning up the lua implementations a bit, too, since the rom is now managed by the machine itself again; fixed potential NPE when filesystems without a label implementation were created 2014-03-08 20:22:16 +01:00
Florian Nücke
2e85d30eb1 forgot to comment out fmp stuffs 2014-03-08 19:00:14 +01:00
Florian Nücke
c4c5368147 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	build.gradle
 2014-03-08 18:52:49 +01:00
Florian Nücke
8023dd4db6 cleaning up gradle scripts a little, adding maven repo generation for publishing 2014-03-08 18:49:06 +01:00
Florian Nücke
f2435a4413 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-07 13:27:44 +01:00
Florian Nücke
bd4df5b61d fixed an issue that lead to invalid energy states (missing 'else'...), most notably in robots not turning on when too full; added safeguard to avoid excess energy after load to cause trouble in tryChangeBuffer v1.2.2 2014-03-07 13:27:16 +01:00
Florian Nücke
47bd274612 quite obviously not fully awake right now 2014-03-07 11:08:31 +01:00
Florian Nücke
cfd8fb4fff Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/block/Cable.scala
	src/main/scala/li/cil/oc/server/network/Network.scala
 2014-03-07 10:50:38 +01:00